Close #72
Work on Issue #69, we need to bump gpg-wrapper to the new version
Progress on #69

This mainly works.
fix regression tests for new wording
Close #69