Scene Cleanup

One Problem Still, Jane doesn't always get spawned.  Starts on
MarketEmpty
Merge pull request #256 from Kiroshima/master

Scene Cleanup