new plugins
snippets
snippets
plop
vim
snip
ultisnips3
vim
vim
Merge branch 'master' of github.com:grirgz/vimrc

Conflicts:
	UltiSnips-2.1/UltiSnips/supercollider.snippets
	ultisnips3