Zapdos has Static now
Parting Shot is sound based
Cottonee is Grass/Fairy
Implement new CAP properly
Fix basic legality check for CAP

Among other things, it allowed having more than 4 moves as well as using moves and abilities from future gens
Merge pull request #474 from Slayer95/patch-1

Fix basic legality check for CAP
Gen 5 Cottonee
Infestation has 20 pp
Stance Change can't be traced
Merge remote-tracking branch 'upstream/master'