Tweaks in GameState

No longer inherits from the dict, but has a dict and some useful
add/remove methods.