mutt pgp: Add mac-specific PGP configs now that they will not error
Merge remote-tracking branch 'origin/master' into linux