Updating vim comfigurations
Merge branch 'master' of github.com:stphndemos/dotfiles

Conflicts:
	.vimrc
updated pathogen
updated install scripts