Attempt to better organize the *NPC* Class.
Merge branch 'master' of https://github.com/ccleary/summoner-the-bescarfed