Commit whatever I have on per-zone gamemodes.. I'll finish this up in 1.7