Reporting

Merging django-reporting branch back onto master, in preparation for deployment.