Fix multiple serious bugs in factory placement code.
Respect min_factory_spacing, rather than using the number "6"
Merge tag 'fix-city-limits-branchpoint' into fix-city-limits