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

Conflicts:
	vim/vimrc