Different targetBG formats for settings objects
Add carbInput to wizard events
Add documentation of annotations
Actually add the annotations file this time
Clarification of "previous"-style fields
Add a note about duplicate events
Add documentation of the storage and output format where they might differ from the input format
Promote activeInsulin on wizard objects
Update the docs based on feedback
Updates to fix up targets and wizard
Merge pull request #22 from tidepool-org/cheddar/doc-fix

Adjustments to documentation
Resolve trivial conflict in v1