Allows two NPCs to have the same name, you can set ids or it will add numbers to the end of the name. Legacy commands work fine except despawn will despawn both. Therefore if it's possible to have more than one with the same name I recommend giving them ids.
Also I removed a few commented out lines and made it compile without warnings (at least in eclipse)
Cleaned up some commented out lines
Implemented ids so two NPCs can have the same name
Stopped all errors and warnings (in eclipse)
Tabs -> Spaces
Wow exactly the same number of additions deletions :O
Did not mean to close that ¬¬