overhaul layout demo; begin process of cleaning up demo redundancies
Merge branch 'master' of github.com:mozilla/brick