NPC 2

Lots and lots of changes. Finished revamping merchants and innkeepers.
Fixed a few bugs. Changed wording.