Fix Scrappy's interaction with Ion Deluge/Electrify

Give Scrappy a negative priority on its onModifyMove action because it was
causing Normal/Fighting moves affected by Electrify to hit Ground types.
Merge pull request #1329 from ascriptmaster/move-fixes

Fix Scrappy's interaction with Ion Deluge/Electrify