stop trying to annotate overlapping data; log some info about overlapping data
remove all uploads that overlap with >= one other upload, then put back the one containing the most recent data
Merge pull request #187 from tidepool-org/jebeck/new-overlap-strategy

new overlapping Carelink data strategy