Add joinKey and subType to bolus records

Per discussion: https://github.com/tidepool-org/data-model/pull/12/files#r10009973
Make commandline actually output json

Allows this tool to be piped to json, eg like this:

  870  grep -C 5 Unabs bewest-carelink.csv  | mmcsv parse - \
         | json -a -C deviceTime type subType joinKey | less
joinKey: naive experiment to predict matching key

Per the joinKey discussions
allow tests to pass while iterating on data model
Include basal-rate-change, wizard, and bolus in desalinate

Release agreed types into result stream.
Actually include basal in desalinate stream
Merge pull request #20 from tidepool-org/bewest/basal-cleanup-02

Actually include basal in desalinate stream
Merge pull request #18 from tidepool-org/bewest/bolus-subtypes

Bewest/bolus subtypes