Added the tokenator.  Site Token parsing still needs to be tested, and the tests in general could be more robust.  Also haven't tested user_data or versioning so that needs work still.