Finally got UltiSnips to work, misc changes
Lots of vim updates