More vimrc updates
Merge branch 'master' of github.com:csand/dotfiles

Conflicts:
	vimrc