fix ultisnips
Merge branch 'master' of github.com:lastagile/vim
f