A couple of enhancements for the vimrc
Merge branch 'master' of github.com:capitancambio/dotfiles
Merge branch 'master' of github.com:capitancambio/dotfiles

Conflicts:
	.vimrc