* Replace use of puppetlabs-concat with richardc-datacat
* Update all templates to use scope.lookupvar