Various fixes to textmate/sublime syntax highlighting