Made the demo a SPA.

 + cleanups.
Merge branch 'master' into gh-pages