Preparing for XY statistics

:)
Merge pull request #100 from smogon/e7cee72d5d7a89ebc8ea0b18bf30087b

Preparing for XY statistics - Clean slate for XY