Jarcast's Ndongo-Matamba for VP 2.1

I posted a version that I used to beta-test a new function available in VP 5.0 but not in 4.22 version.
I reverted the change to the previous available function.

Changelog:
- UA nerf: +2 Production, Culture, Defense (was +3), but UA limit raised to 15 (was 10).
- UI: loses +1 Border Point, and +1 Science at Alternative Energy but now replaces only the Village, so Fort is again available for build.
- UGP buff: more Science from expending a Makunze.

Changelog:
- repealed AITypes changes on Pombo thanks to azum4roll's comment;
- Kilombo nerf: removed +1 Great General point at Military Science, +1 Science at Military Science (was +2), +1 Culture at Radio (was +2), added +1 Science at Alternative Energy;
- increased Science from expending Makunze.

Changelog:

• Kilombo yield from Tech: +2 Science moved from Chemistry later to Military Science, +2 Border Growth moved from Military Science earlier to Chemistry. Production at Industrialization reduced to +1 (was +2);
• Added Attack and Defense UnitAI type to Pombo (so AI can use them also at war);
• Reduced Science amount from expending a Makunze.

.

Changelog:

• fixed audio bug.
• fixed UA applying also to City-States declaring war.
• added 10 turn timer (standard speed) between UA unit gift activation due to declarations of war .

Thanks to gwennog.

Thanks to Urzamax.

Thanks to gwennog for reporting.

Changelog:
Removed some yield gained on techs from Fort that makes the Kilombo too OP.