Update e2e scripts to use the -template parameter.
Add a script for the update demo.
Merge pull request #965 from brendandburns/integration

Update e2e scripts to use the -template parameter.  Add a new test.