Refactoring and addng some more stream matcher Tests
CLeaning up imports
Replacing integer rule type with enum
initial token api with docs

this needs cleanup
Merge branch '020' into authtokens