Merge master to develop, in preparation for CI on the development branch

We'd like to auto-upload a development `dashboard.couch`, so that we can test it easily in medic-os before merging to master. This is step one.