Moved remaining snippets to UltiSnips