fixes for vimrc
Merge branch 'master' of github.com:mialinx/dotfiles

Conflicts:
	.vimrc