Yet more tech tweaks.

This was SVN commit r11641.

binaries/data/mods/public/simulation/data/technologies/armor_cav_chamfron.json

@@ -1,5 +1,5 @@
 {
-	"pair": "hele_pair_cav_01",
+	"pair": "pair_cav_01",
 	"genericName": "Chamfron",
 	"specificName": {
 		"generic": "Cavalry Armour Upgrade",

binaries/data/mods/public/simulation/data/technologies/attack_cav_lance.json

@@ -1,5 +1,5 @@
 {
-	"pair": "hele_pair_cav_01",	
+	"pair": "pair_cav_01",	
 	"genericName": "Cavalry Lance",
 	"specificName": {
 		"generic": "Melee Cavalry Upgrade",

binaries/data/mods/public/simulation/data/technologies/hele_pair_cav_01.json

@@ -1,5 +0,0 @@
-{
-	"genericName": "Xyston vs. Prometoopidion",
-	"top": "hele_cavlance",
-	"bottom": "hele_chamfron"
-}

binaries/data/mods/public/simulation/data/technologies/pair_cav_01.json

@@ -0,0 +1,5 @@
+{
+	"genericName": "Lance vs. Chamfron",
+	"top": "attack_cav_lance",
+	"bottom": "armor_cav_chamfron"
+}

binaries/data/mods/public/simulation/templates/structures/cart_super_dock.xml

@@ -9,9 +9,11 @@
     <Civ>cart</Civ>
     <GenericName>Naval Shipyard</GenericName>
     <SpecificName>Cothon</SpecificName>
+    <Classes datatype="tokens">-City Town</Classes>
     <History>The structure is based upon the centre island of the inner harbour constructed to house the war fleet of the Carthaginian navy at Carthage.</History>
 	<Tooltip>Construct and repair mighty warships.</Tooltip>
     <Icon>structures/uber_dock.png</Icon>
+	<RequiredTechnology>phase_town</RequiredTechnology>
   </Identity>
   <Cost>
     <PopulationBonus>10</PopulationBonus>

binaries/data/mods/public/simulation/templates/template_structure_economic_farmstead.xml

@@ -39,7 +39,7 @@
   </Obstruction>
   <ProductionQueue>
     <Technologies datatype="tokens">
-      boost_farming_plough
+      gather_farming_plough
     </Technologies>
   </ProductionQueue>
   <RallyPoint disable=""/>

binaries/data/mods/public/simulation/templates/template_structure_economic_mill.xml

@@ -39,8 +39,7 @@
   </Obstruction>
   <ProductionQueue>
     <Technologies datatype="tokens">
-	  shaft_mining
+	  pair_gather_01
-	  helots
     </Technologies>
   </ProductionQueue>
   <RallyPoint disable=""/>

binaries/data/mods/public/simulation/templates/template_structure_military_barracks.xml

@@ -47,7 +47,7 @@
   </Obstruction>
   <ProductionQueue>
     <Technologies datatype="tokens">
-	  hele_pair_cav_01
+	  pair_cav_01
     </Technologies>
   </ProductionQueue>
   <Sound>