config instructions
Merge branch 'master' into dynamicreports
Merge pull request #796 from dimagi/dynamicreports

self-merge due to documentation only change + removing dead code