Final tweaks to the witch/witch hut.

Added in ingredient trades and fixed prices for the potions. Also added
glass as an option during generation for the witch hut, and changed the
witch villager's skin tone to match the other villagers.