Rooms now default to demo.
Merge branch 'glavin' into dawson
Updating for demo.