added snips
Merge branch 'master' of ssh://github.com/nbren12/dotfiles

Conflicts:
	vim/mysnippets/python.snippets