GPG key + passphrase mode detects that passphrase was entered.

Also some whitespace cleanup - let me know if you want me to resubmit without.