massive update now that we can work in public. sorry.
Merge pull request #3 from tidepool-org/kjq/mergePrivate

massive update now that we can work in public. sorry.