Merge pull request #75 from tidepool-org/cheddar/link-undelivered

Link the undelivereds with the delivered.
Merge branch 'master' into cheddar/code-alternation