Make people default to military and clean up update_game_state a bit