Almost done updating Battles maps to new format
Merge remote-tracking branch 'origin/new-map-config' into new-map-config