Reverted master back to a previous commit. Half-finished game manager stuff goes in its own branch for now.