Conquistador fix

The Unwelcome Evangelist promo renders this unit useless as a military
unit as it dies within 2 turns if in enemy territory
Flourishing Arts

Changed the text to match the effect and added appropriate FLAVORs
Churches of Lalibela

Added the 'Holy City' prerequisite to allow only a player or AI with a
religion to build this wonder.