vimrc some config changes
Merge branch 'master' of serv:git/dotfiles

Conflicts:
	.vimrc