Update grammars

Also added a test for an existing c++ syntax highlighting issue.