Added tileset loading logic, slightly refactored map loading. Also converted tileset def into json