More vimrc changes