Fix some issues with ShopTrait item costs/results and add NBT filter API. Adjust /npc item to be more flexible. (commit: ede598c)