Revert behavior for encrypt options when no password is specified.  Fixing #16