Whitespace fix.
Fixed the wording of a diagnostic and added more test cases for things we expect to diagnose.
Merge branch 'tra-working' of https://github.com/dfsutherland/clang into tra-working