Bug fixes in Cheetah template code.
Merge pull request #56 from stemcellcommons/master

Bug fixes in Cheetah template code.