vimrc: minor vimrc cleanups