[vim] .vimrc cleanup

Conflicts:
	vim/.vimrc