coupla new annotation codes
add deviceMetaId and change name/scope of device overlap annotation in response to feedback
Merge pull request #33 from tidepool-org/jebeck/moar-annotations

coupla new annotation codes