tweak normal bolus and cbg a bit more

Make more consistent across model.
Merge branch 'master' of github.com:tidepool-org/data-model