Fix user always accidentally join bot's ally when they click bot to try to remove them.
Some clean up of SkirmishControl code
Fix SkirmishControl's list flicker when SpringScanner is updating resource list.