vimrc fixes and improvements