Merge pull request #1356 from RedBeard0531/vim_syntax

Improve vim syntax definition