Various fixes to textmate/sublime syntax highlighting
Merge pull request #5043 from malmaud/sublime

Enhance textmate/sublime syntax highlighting