Trivial fix to deffamily shaymin; remove mew from glameow-family (lol)
Merge branch 'master' of github.com:monsanto/smogon-redux