ensure activity reports with custom fields work properly.

See http://issues.civicrm.org/jira/browse/CRM-13715
Merge pull request #2037 from jmcclelland/reports-with-custom-fields

ensure activity reports with custom fields work properly.