9c3f8bc Merge branch 'master' of github.com:nightscout/d-data-2014-11 into ns/init