Changes to add annotations for mismatched settings
Merge pull request #29 from tidepool-org/cheddar/settings

Changes to add annotations for mismatched settings. LGTM.