Switched villager in village, removed some trees in forest

[lyn-cork]

• switched an incorrect villager with the correct one
• removed the trees that were the worst offenders of being planted on top of another