Changes to handle new data model
Merge pull request #171 from tidepool-org/cheddar/new-format

Changes to handle new data model