Wire in two portraits from mainline campaigns
Use mainline khalifate units if available
Update a few khalifate baseframes
Replace tabs with spaces in .cfg files