new ultisnips
Merge branch 'master' of https://github.com/fengjingchao/vimfiles
merge