Merge "Adding instructions on setting up gpg-agent on a Mac"