Fixes and tileset switch. Added includes

fixed map editor bug. Switched to Goo's latest tileset. Added includes.