Port original snippets to UltiSnips format including some minor tweaks
Merge pull request #1 from alexanderjeurissen/UltiSnippets

Port original snippets to UltiSnips format including some minor tweaks