vimrc: more cleanup