Some vimrc cleanup