vimrc: cleanup/minor fixes