Update Electrify and Ion Deluge

Added the proper activation messages and corrected Ion Deluge's implementation. Also changed Fairy Lock's target to "all".
Merge remote-tracking branch 'upstream/master'
Seasonal: Remove status from Present

The statuses seem to fail, so just remove them altogether for now.
Gen 2: Waterfall has no change to flinch
Also, add newline at the end and remove trailing comma for compatibility.
Sorted moves alphabetically (Magikarp's revenge stays at the end as it used to be).
Merge pull request #506 from Slayer95/master

Gen 2: Waterfall has no chance to flinch
message
Merge remote-tracking branch 'upstream/master'