newest gvimrc changes
Merge branch 'master' of https://github.com/kirbyfike/dotfiles

Conflicts:
	gvimrc