Fixed entity manager from future errors concurrent modification and
logic error in entity removal code.

added a simple Collision class

modified Entity class so its more of an entity and not a super object.

-Partial commit... Sorry emergency.