Better Vanilla Villager Trades

Using VillagerConfig, this fixes many of the problems with Villager trading in a way that still feels vanilla, incorporating some of the ideas from the experimental trading snapshots.