clean up vimrc

Conflicts:
	.vimrc