Merge pull request #742 from mcmonkey4eva/master

Pull request for minor things
Fix build (remove npc skin stuff)

NPC Skins were scrapped in Citizens, remove all links to that so we can
actually build