vimrc: cleanup + more pedantry