Fixed Recharging moves (Tested Hyper Beam)
Removed old recharge stuff that wasn't working (waitAfter)
Merge remote-tracking branch 'origin/master'
Merge pull request #856 from Hiroku/master

Recharge moves fixed