updating to latest templatebuilder, minor update to the build. Resolved #25
merge