Edits to snippets (WIP)

Edits to snippets file to make them work correctly with the latest version of UltiSnips. I'm assuming that you wanted these snippets to work with UltiSnips, if so this should be good to merge. If not, maybe there's some way we can work out UltiSnips support alongside your snippets file?