ultisnips conversion
Merge branch 'master' of bitbucket.org:skeept/dotvim
Merge branch 'master' of bitbucket.org:skeept/dotvim