Redid shop item ratios and moved merchant

Moving the merchant seemed to prevent some of the random teleport stuff