Merge pull request #5 from calmofthestorm/master

Rename vim grammar to reduce confusion.