changes to events index as discussed with chris and dave
Merge remote-tracking branch 'origin/master'