Fixed some merge stuff in frogatto, and cleaned up a mess of unquoted identifiers in various tilesets.