gpg-agent stuff and git changes