Removed redundant #include's from entity.c
Fixed type names in world.c Tile --> tile_t etc.

Changed tile struct so that the entity is stored directly. This keeps
things simpler, and also will probably have better performance due to
getting more cache hits when memory accesses are localised.