Merge pull request #932 from LightAdept/master

Fix to magneton (his new model added) and disabling articuno
Merge remote-tracking branch 'origin/master'
New growlithe, squirtle, small change to armaldo, and nidorina!