Quickfix for AIM 3.0 (#119)

definitions/region/g20.yaml

@@ -1,4 +1,5 @@
 - G20 members:
+    # individual countries
     - Argentina
     - Australia
     - Brazil
@@ -18,5 +19,9 @@
     - Turkey
     - United Kingdom
     - United States
+    # organisations that are part of the G20
     - African Union
     - European Union
+    - European Union and United Kingdom:
+        note: This region is used for models that do not have a distinct regional
+          resolution for the United Kingdom and the European Union.

definitions/region/native_regions/AIM_3.0.yaml

@@ -26,11 +26,11 @@
           Equatorial Guinea, Eritrea, Eswatini, Ethiopia, Gabon, Gambia,
           Ghana, Guinea, Guinea-Bissau, Kenya, Lesotho, Liberia, Madagascar,
           Malawi, Mali, Mauritania, Mauritius, Mayotte, Mozambique, Namibia,
-          Niger, Nigeria, Rwanda, Réunion, Saint Helena, Ascension and Tristan da Cunha,
-          Sao Tome and Principe, Senegal, Seychelles, Sierra Leone, Somalia,
-          South Africa, Sudan, Tanzania, Togo, Uganda, Western Sahara, Zambia, Zimbabwe
+          Niger, Nigeria, Rwanda, Réunion, Sao Tome and Principe, Senegal, Seychelles,
+          Sierra Leone, Somalia, South Africa, Sudan, Tanzania, Togo, Uganda,
+          Western Sahara, Zambia, Zimbabwe
         ]
-    - AIM 3.0|EU:
+    - AIM 3.0|EU & UK:
         countries: [
           Austria, Belgium, Cyprus, Czechia, Denmark, Estonia, Finland, France, Germany,
           Greece, Hungary, Ireland, Italy, Latvia, Lithuania, Luxembourg, Malta,

mappings/AIM_3.0.yaml

@@ -10,7 +10,7 @@ native_regions:
   - TUR: AIM 3.0|Turkey
   - USA: AIM 3.0|USA
   - XAF: AIM 3.0|Other Africa
-  - XE25: AIM 3.0|EU
+  - XE25: AIM 3.0|EU & UK
   - XER: AIM 3.0|Rest of Europe
   - XLM: AIM 3.0|Rest of Latin America
   - XME: AIM 3.0|Middle East
@@ -108,5 +108,5 @@ common_regions:
   - African Union:
       - XAF
       - XNF
-  - European Union:
+  - European Union and United Kingdom:
       - XE25