Merge pull request #127 from remear/customer-scenarios

Update remaining scenarios to use Customer
Generate new mako templates