Better consolidation of Archipelago with Pithos and Cyclades

This merge introduces the necessary changes required to better integrate Archipelago v2 mapfiles with Pithos and Cyclades.