[vim] improve config

Conflicts:
	vim/.gvimrc
	vim/.vimrc