Fix some variable token issues.
Merge pull request #9 from journeyapps/master

Fix handling of templates without tokens