setup: Set bare to use new file location when using PGP
Merge remote-tracking branch 'origin/master' into mac