Merge pull request #19 from colincoghill/3.9.2-bugfixes

Merge pull request #18 from colincoghill/master
Merge pull request #20 from colincoghill/master

testing
Don't filter out groups that expired yesterday, it stops us seeing results from last semester.
Merge remote-tracking branch 'origin/3.9.2-bugfixes' into 3.9.2-bugfixes
Merge pull request #21 from colincoghill/3.9.2-bugfixes

3.9.2 bugfixes
Merge pull request #22 from colincoghill/master

bugfix