Merge pull request #30 from DougGregor/versioned-apinotes-3_1

[API Notes] Allow versioned API notes to override information provided by headers