zsh: move git stuff .zshrc_common -> .zshrc
zsh: small fixups