Merge pull request #9 from rcook/master

Merge of encryptor2 functionality into encryptor with compatibility mode for existing API