GPG: Simplify gpg-agent configuration
GPG: Add sensible configuration to gpg
Merge branch 'master' into oucs