Merge gamestate.py into stateframe.py