Cleaned up the Humanoid class and added NpcEntity
Further file cleaning
Renamed Humanoid to LivingEntity and deleted NpcE
Merge pull request #20 from octavus/NpcEntity-Branch

Merged the branches