pull in updated templates from omniti-build template branch