git alias: `gM` forces merge commit; `gm` is auto
drop flaky ~/.cvsignore handling from `scp` alias
update ZSH bundle submodules: they've stabilized