SwitchList should always sort cars by station and industry

[bowdidge]

Currently, most switchlist templates display cards in the following order:

• Sort all cars based on where the train would pick up the car.
• Sort cars at each station by town, destination industry, and reporting marks.

This works well for the cars being dropped off - they're roughly grouped into where they're going. However, cars being picked up are only sorted by town and no further.

Cars being picked up should also be sorted, but first by the town where they're located and then by the industry and reporting marks.

The disorder is more obvious for large towns with many industries.

[bowdidge]

Note that the cars are currently sorted by destination industry, but alphabetically. Sorting by destination industry in visit order would be more useful.