keep only the most recent of two overlapping uploads from the same model of device
address a small issue with basals of unknown duration, common when initializing a new device
adjust settings history for gap when removed data from overlapping uploads (same model no.)
merge in new upload record work
further work and add tests for removing overlapping uploads from same model of device
Merge branch 'mvp' into jebeck/same-model-overlap

Conflicts:
	lib/carelink/carelinkDriver.js
add 7-series versions of Veo and 530G
remove relying on supportedModels within the actual logic (only for logging surprises)
Merge pull request #33 from tidepool-org/jebeck/same-model-overlap

deal with same-model overlapping uploads