lots of vimrc cleanup