account for nil steps and calories (aka didn't sync today!)
Merge branch 'master' into secure-api