catch common errors in location bulk import
add receipts to sales/consumption report
psi report changes
show hierarchy on cumulative sales/consumption report
remove dead code
Merge branch 'master' into commtrack

Conflicts:
	corehq/apps/reports/commtrack/psi_prototype.py
Merge pull request #640 from dimagi/commtrack

psi report tweaks