Fixed witch trades and hut weight.

The hut now spawns normally in villages. Fixed trades from the witch
giving an invalid stack of potions.