snarez/calculon — pull request #25 by richo (2013-11-18 07:06:22+00:00)
Title: Bugs/missing token generation

Either my PR was bad or something bad happened since then.

either way, this unbreaks calculon