Updates to gvimrc and vimrc from my MacBook Pro
Merge branch 'master' of https://github.com/edouardp/vimfiles

Conflicts:
	vimrc