Patching after gem updates
Merge pull request #585 from projecthydra/fixes

Patching after gem updates
Combining event streams for dashboard and getting rid of unused column