Update vimrc
Merge branch 'master' of github.com:metafour/dotfiles

Conflicts:
	vimrc