display name of village in report
don't use global variables
Merge pull request #2 from dimagi/psi-fixes

display name of village in report
merge with master
remove inline conditionals