Revert behavior for encrypt options when no password is specified.  Fixing #16
Merge pull request #17 from djohnson/fix_broken_encrypt_output

Revert behavior for encrypt options when no password is specified.