replace last references to combine in app-template for #118
Merge pull request #138 from pedestal/combine-in-app-template

replace last references to combine in app-template for #118