Take the greatest Elo per gametype in merges.

With Elo rot in place, doing a weighted average is no longer
appropriate. We will still sum the game count between the two
records, but the Elo will get set to the maximum score instead
of the weighted average.
Merge branch 'master' of github.com:antzucaro/xonstatdb