Fix up variable names in game_end
Test ending a game via AP and via round limit
Merge upstream UK pack fix with my game_end fix