Improved vim syntax file.
Use standard vim syntax groups.
Merge pull request #1085 from hjoliver/vim-syntax-update

Improved vim syntax file.