more cleanup of vimrc