changes to snippets
Merge branch 'master' of https://github.com/realincubus/vim-snippets
merged with upstream changes. and forked this to my own repos

Conflicts:
	UltiSnips/c.snippets
	UltiSnips/cpp.snippets