Merge branches 'master' and 'gh-pages'
Add app init to main.js
Remove model defaults and template output
Merge branches 'gh-pages' and 'master' into gh-pages