Lean up demo some more
Merge branch 'develop' into gh-pages