Merge pull request #18 from brobie/master

Allow For Command Line Resetting of Encryption Key and Data ReEncryption
Merge branch 'classyllama/master'