Fix name tags affecting NPC names
Merge pull request #3 from CitizensDev/master

Fix name tags affecting NPC names