Properly parse tilesets with spacing

Also height/width wasn't properly calculated for a TileSet.
Merge branch 'cryptophix-master'