minor vimrc changes
Merge branch 'master' of github.com:denvercoder9/dotfiles

Conflicts:
	vimrc
Merge branch 'master' of github.com:denvercoder9/dotfiles
fix merge