Pulled the latest commits
switched my shells and cleaned up some whitespace
Merge branch 'master' of github.com:irrigger/ir-vim

Conflicts:
	vimrc