comments out some lines that i don't understand. adds
snippet plugins
Merge branch 'master' of https://github.com/tmschl/dotfiles-2

Conflicts:
	vim/vimrc