Fix Keldeo-R being unusable in most formats

Also, don't show any error and just change to base species if the requirements for using Keldeo-R are not fulfilled.
Update Electrify and Ion Deluge

Added the proper activation messages and corrected Ion Deluge's implementation. Also changed Fairy Lock's target to "all".
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
Merge pull request #505 from Slayer95/patch-1

Fix Keldeo-R being unusable in most formats
Respawn suddenly dead worker on cluster
Merge branch 'master' of http://github.com/Zarel/Pokemon-Showdown
Assist can't select Roar / Whirlwind
Knock Off doesn't remove item if user faints
Move modlog in help from Moderators to Drivers.
Merge pull request #509 from kupochu/patch-2

Move modlog in help from Moderators to Drivers.
Possibly fix /kill not causing a restart in forever
Revert "Add the no battle process hack"

This reverts commit 2ca19e1ebaba07b9ad1c914a55154d86d392759d.
Merge remote-tracking branch 'upstream/master' into amethyst

Conflicts:
	config/commands.js
	mods/gen2/moves.js
Add single process hack