Merge pull request #41 from dalers/master

merge latest from Mark
Fix bug in load_demo_om.sql and re-enable debugging by default for now.