Merge pull request #12 from jsumners/develop

Refactoring and extra debugging
Oops. Logging was copied to the wrong place.

I accidently copied the logging from the Token decryption method
to the wrong place in the Crypto decryption method. Sorry about that.