First part of EntitySystem integration
minor change to correct my git settings and associate commits to my account
ES merged with the new character