Merge pull request #626 from TalkTakesTime/master

Fix Knock Off getting boosted for unremovable items
Megastones boost Knock Off if held by the wrong mon
Remove extra megastone check in Knock Off
Making Mega Mawile start with Intimidate

Forcing a Mawile with the Mawilite to have Intimidate rather than Sheer Force
Merge pull request #628 from Relados/patch-5

Making Mega Mawile start with Intimidate
Merge pull request #627 from Slayer95/patch-5

Megastones boost Knock Off if held by the wrong mon
Merge remote-tracking branch 'upstream/master'