snipmate.vim (https://github.com/msanders/snipmate.vim)
Merge branch 'dev'