Minor fixes for playtest.

Removed UnderTheChair scene, as it wasn't relevant to the project any
more, and kept getting built as the main scene.
Merge issues