vimrc: more fixes