Added new activity reports and cleaned up some of the report code

https://www.pivotaltracker.com/story/show/62183466