Removing UltiSnips here too
Merge branch 'sherwin' of https://github.com/wmhess/dotvim into sherwin