Merge in reporting changes

All reports now filterable by faculty and a bit more consistent, plus some other bits of tidying