Consolidated token annotations and language id
Merge pull request #1 from twolfe18/master

Consolidated token annotations and language id