More vimrc cleanup.