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

Conflicts:
	dot.vimrc