Fix a number of demos, comment out broken ones.
Merge pull request #22 from dstockwell/fix-demos

Fix a number of demos, comment out broken ones.