greg laptop tweaks
Merge branch 'master' of github.com:gedwards/dotvim

Conflicts:
	git-prompt.conf
	spell/en.utf-8.add
	spell/en.utf-8.add.spl
vundle added. pathogen removed