updated with midseason changes
Merge pull request #412 from smogon/17430a601026d8d21774800faa588c90

updated with midseason changes