Miscellaneous changes to vimrc
Merge branch 'master' of https://github.com/jrothenbuhler/dotfiles

Conflicts:
	.vimrc