Crypt nits

I want to start generally trying to help out with securedrop. Consider this my first noob patch. I tried to make it pretty minimal. Doesn't really change much, but generally makes things clearer(IMHO). I am not sure if the name parameter API is a TO add thing. On any account, the encrypt method seems to be doing some very tricky things and could probably use some work next.