Fix nasty bug in match validation test

I wasn't generating matches correctly and so the tests were blowing up
pretty badly for everyone.  This should hopefully fix the issue.
Merge branch 'master' of https://github.com/geisler/game_contest_server into gmaster
Merge branch 'gmaster' into dev. (Final tests!)
Done! 508/508. 0 failures.