mutt pgp: Add mac-specific PGP configs now that they will not error
shell: If using Mac, override ls with gls
Merge remote-tracking branch 'origin/master' into mac
mac custom commands: Use master version of custom_commands