Port original snippets to UltiSnips format including some minor tweaks

merging this to test if using runtimepath option of Neobundle and Vundle only pull the Ultisnips snippet