Merge pull request #128 from remear/customer-scenarios

Generate new mako templates