Enabling encryption.
Enabling encryption in a different place.  Response to code review comments.
Merge pull request #1 from inuaineko/cmeyer/enable_encryption

Enabling encryption.