NEXT: Fix Life Orb/Confusion Interaction

Add an extra conditional to Life Orb's recoil damage, fixing a bug where Confusion caused Status moves to suffer Life Orb recoil.
NEXT: Fix Thick Fat

Update Thick Fat to fix a bug involving it activating twice against Fire and Ice type moves.
NEXT: Actually fix Substitute

Properly update Substitute to be bypassed by Sound based moves and Infiltrator users.
Also update list of SubBlocked moves to Gen 6.
Fix Protean activation timing
- The message for the move usage is now sent before Protean's activation.
- Protean is affected by Electrify and Ion Deluge.
- Protean activates after the move target is resolved.
NEXT: Fix Indentation
Merge pull request #1072 from NickMP/patch-5

NEXT: Misc. Bug Fixes
Merge pull request #1073 from Slayer95/protean

Fix Protean activation timing
Fix aurae of the same type stacking together
Dark Aura, Fairy Aura
Merge pull request #1074 from Slayer95/aura

Fix aurae of the same type stacking together
Move OMs to 2nd column and BW2 + Past Gens to 3rd
LC is having a suspect test
Update /om
Merge branch 'master', remote-tracking branch 'upstream/master'