Conquistador

The new 'dummy' unit replaces the existing unit once religion spread
becomes critical. This hopefully will fix the dying in enemy territory
when it is used as a military unit.