Save the map choice from the Skirmish button.
Attempt to pick a more sensible starting map. Fixes #4273.
Merge pull request #4276 from pchote/initial-map

Improved automatic map selection.