A few PSR-2 tweaks
Add a token generator class and interface
Add a couple of unit tests