vimrc: another round of cleanup