Gen 6 changes to past stuff.

BP Move changes (left out hidden power)

Add missing pokemon fairy types

Fairy type for charm and string shot change
Merge pull request #468 from CrystalMoogle/gen6data

Move changes (left out hidden power)