Merge branch

Added additional logging and made the gpg finder alias a bit more resilient.