fix template errors
Merge branch 'devel' of git://github.com/LancePutnam/Gamma into devel