Make *nix and Windows vimrcs match more closely