lots of cleanup work on adding npc subtypes  
add a few item icons for testing subtyping
more cleanup of npc types/items/icons