Work on merging clusters... not perfect yet

Lots of work on the merging algorithm. It works for the vast majority of
clusters now, but not for all of them. In particular, it doesn't work
for some clusters spanning many chunks in both the X and Z directions.