more vimrc cleanup
Merge branch 'master' of github.com:kamykaze/dotfiles

Conflicts:
	_vimrc