Update CHANGELOG.md
Fix the millisecond time precision in the client
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