blah
Encryption stuff
Revert "Encryption stuff"

This reverts commit 07da3b305a1296a7a9c950c1561cca0565ee1c5a.
Revert "blah"

This reverts commit dd99dac3e08acc6f4a8fbc178ffbd984ffef8f35.
Merge pull request #153 from daverboy23/master

Encryption stuff