Changed world definition to be image based rather than tile based
Cleaned up headers and removed old world definition code
merged in image_based_map branch