Npc names outlined in images

To complement #2256 - all the npc images now have their names in white text with a black outline for easy reading. This pull also cleans up a couple of non-existent npcs.