Replaced unbundle with pathogen
Merge branch 'eligundry' of github.com:eligundry/dot_win into eligundry

Conflicts:
	.gitmodules
	vim/bundle/neosnippet
	vim/bundle/pathogen
	vimrc
	zshrc