More Gen 6 move changes
Incinerate removes Gems in Gen 6
More Gen 6 Pokemon data
Merge remote-tracking branch 'upstream/master'