Merge pull request #83 from KyleW/demoKW

I made a few changes for the demo.  Hiding stuff that's not done, etc.
Merge branch 'master' into demoKW