[tag-zsh] zsh cleanup, plus some keychain fixes