Iberian struggle vapourised, a bunch of flags added, a bunch of loc done and spain can now have cultures/religions

history/provinces/k_aquitaine.txt

@@ -216,15 +216,12 @@
 2221 = {	#MENDE
 	holding = city_holding
 }
+2227 = {	#MARVEJOLS
+	holding = city_holding
+}
 2224 = {	#SAINT FLOUR
 	holding = church_holding
 }
-2291 = {	#LANGEAC
-	holding = none
-	994.1.1 = {
-		holding = city_holding
-	}
-}
 
 ###c_rouergue
 2226 = {	#RODEZ
@@ -235,9 +232,6 @@
 2228 = {	#LA SALLE
 	holding = none
 }
-2227 = {	#MARVEJOLS
-	holding = city_holding
-}
 2229 = {	#LA PEYRADE
 	holding = none
 }
@@ -412,6 +406,9 @@
 2292 = {	#MURAT
 	holding = none
 }
+2224 = {	#saint_flour
+	holding = none
+}
 
 ###c_clermont_sur_allier
 2289 = {	#CLERMONT SUR AILLER
@@ -449,6 +446,12 @@
 	holding = city_holding
 }
 
+2291 = {	#LANGEAC
+	holding = none
+	994.1.1 = {
+		holding = city_holding
+	}
+}
 ##d_bourbon ###################################
 ###c_bourbon
 2307 = {	#MOULINS

history/provinces/k_navarra.txt

@@ -1,65 +0,0 @@
-# 1806 - PAMPLONA
-1806 = {	# PAMPLONA
-	# Misc
-	culture = basque
-	religion = sevillian
-	
-	holding = castle_holding
-}
-1889 = {	# TAFALLA
-	holding = city_holding
-}
-1809 = {	# LIZARRA
-	holding = church_holding
-}
-
-###c_najera
-1811 = {	# NAJERA
-	# Misc
-	culture = basque
-	religion = sevillian
-	
-	holding = castle_holding
-}
-1810 = {	# LOGRONO
-	holding = city_holding
-}
-1903 = {	# ARNEDO
-	holding = church_holding
-}
-
-###c_tudela
-1902 = {	# TUDELA
-	#Misc
-	culture = basque
-	faith = sevillian
-	
-	holding = castle_holding
-}
-1890 = {	# TARAZONA/Olite
-	holding = city_holding
-}
-
-###c_viscaya
-1803 = {	# BILIBIO/Vizcaya
-	# Misc
-	culture = basque
-	religion = sevillian
-	
-	holding = castle_holding
-}
-1808 = {	# ALAVA
-	holding = city_holding
-}
-
-###c_ipuskoa
-1805 = {	#  IRUN
-	# Misc
-	culture = basque
-	religion = sevillian
-	
-	holding = castle_holding
-}
-1804 = {	# IZURUM
-	holding = church_holding
-}