Merge pull request #45 from dimagi/cz

fix 500s
report map in init.py
Merge branch 'master' into mwhite
Merge pull request #46 from dimagi/mwhite

report map
hotfix for calculators returning None in an indicator calculation