Edits to vimrc
Merge branch 'master' of github.com:JCook21/vip

Conflicts:
	.vimrc