More vimrc cleanup