Modify merge to work with regex
More logging
Merge points at the shard level
Return the merged data using the alias

Since we return an error if the same series has more than one alias this
fixes #270
rename a test file
Use the standard heap implementation
make sure we close the point iterators
Merge branch 'fix-72'