another new overlapping uploads strategy plus pending tests
update annotation definitions for new uploader
add tests for adjustments to overlapping uploads strategy
Merge pull request #192 from tidepool-org/jebeck/some-bugfixes

collection of small changes for new uploader