Fix some outstanding todo's re: tokenlib api
Merge pull request #21 from mozilla-services/rfk/fix-some-todos

Fix some outstanding todo's re: tokenlib api