Update token capitalization & usage

Upstream changes to naming / tokenizing made things easier, but
necessitated changing the token analysis code. Some legacy manual
span analysis code may still exist.
Merge pull request #196 from mcoffin/token_conventions_nightly

Update token capitalization & usage