refactor encrypt function and call sites for clarity
encrypt replies with the journalist key as well as the reply key
test encrypting replies with journalist key
(nit) use more appropriate assert method
Merge pull request #633 from freedomofpress/encrypt-replies-to-journalist-key

Encrypt replies to journalist key