Merge AI-demo and mainline experimental recruit logic

Slight speed improvement when close to unowned vilages. Correct score
for time of day damage estimates for encountering the enemy near end of
game.