demo app html templated with JS now

So that it's more exportable with requirejs
Merge branch 'master' into gh-pages