colors from meeting with @skrugman on 2014.07.16
Merge pull request #150 from tidepool-org/jebeck/update-colors

colors from meeting with @skrugman on 2014.07.16