Update token tree
Update lints
Merge pull request #202 from bjz/update-token-tree

Update token tree