udpating vimrc
Merge branch 'master' of github.com:mwise/dotfiles

Conflicts:
	.vimrc