Switch back to python-gnupg for now

Porting to gnupg ended up being non-trivial. We still want to do this
eventually, but we found several bugs in gnupg and don't want to be blocked on
it anymore.
Merge remote-tracking branch 'upstream/master'