more vimrc polish and cleanup