Add command line option to switch which border generation model to use,
mostly for testing.
Fix typo bug with map generation.
A lot of work to reconfigure the border generation, attempting to get
the allyGen system working. Still broken but closer.