Revert "Merge branch 'master' into sweepstakes"

This reverts commit ab4ad355cfdba9fa734463fb0e3f06e703f3d0c7, reversing
changes made to ed9c2f3d4f230a536baac91833f9302d6036f495.
Revert "Revert "Merge branch 'master' into sweepstakes""

This reverts commit 317613a8b21470d20ce241b29d5db3838bb58744.

***

Yeah, crazy "merge-revert-rerevert" workflow. Here's the story.

So I'm merging from master into sweepstakes, and I realize OH MY GOD
THERE'S NO COMPUTESWEEPS FUNCTION IN THE EVENT CLASS OMG GIT DELETED MY
CODE AAAAAAH

Never mind that there's no computeSweeps function in Event. That's in
EventResults.

Anyway, I freak out and try frantically to figure out how to revert a
merge. EGit won't let me (yes, I'm using EGit), telling me the commit
has two parents, so I Google it and figure out how to revert a merge
from the command line.

Then, I breathe a sigh of relief. I look at the commit in EGit just to
be sure, and notice that the diff is much shorter than I would expect
for a commit that ostensibly restores several missing functions.

I freak out again, but in a more productive way this time. I scrutinize
the compare editor, and find that the revert only changed one line.

That's when I realize that I was freaking out about the wrong function,
since computeSweeps is in EventResults. I check EventResults, and sure
enough, there it is.

That's why I'm making this commit.

Ah, the adventures of a Git newbie.