Fixed some map object stuff and the entity heirarchy

Apparently, GameObject cannot implement Collidable because it causes
some problems with the quad tree.