misc
Merge branch 'master' of github.com:wecing/snipmate.vim