More vimrc rejigger