JWT Tokens Redux

Moved to a topic branch on origin

Replaces #322