Update: refactor tokens API (refs #1212)
Merge pull request #1514 from btmills/token-store

Update: refactor tokens API (refs #1212)