Fixing and cleaning up old stuff
Switching to UltiSnips