updating for clarity
updating token syntax for clarity
Merge pull request #27 from Binstar/feature/token-standardization

Feature/token standardization