re-add some changes made to events/index view that were cut out of merge conflict.
re-add some changes made to events/index view that were cut out of merge conflict.

therebelrobot/brigadehub,sfbrigade/brigadehub,therebelrobot/brigadehub,sfbrigade/brigadehub