Update test to test for new format
Change _merge() to handle more than 2 args
Change timeseries() to merge dicts for the same date