Merge UltiSnips snippets into vim-snippets.

As discussed this is a PR that merges the ultisnips snippets. I still touched the README.md to update that SirVer/UltiSnips is the version that people need to track now. 

As before: please only give your lgtm, I'll merge as soon as I release UltiSnips 3 - probably during this week.