Big refactor of npc/merchant module. Now pulling zone spawn info, faction hits and merchant items in the main query. No longer running multiple queries after the fact.