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

Conflicts:
	spec/models/match_spec.rb
I am passing all of the tests!