udpate vimrc
Merge branch 'master' of github.com:camme/.configs

Conflicts:
	.vimrc