Better syntax highlighting. Fix exception
Merge branch 'master' of github.com:Floobits/floobits-vim