Merge pull request #1218 from Xwaffle1/master

Model fixes for WigglyTuff and Jigglypuff.
Manually added ghostwolf's fixes
Merge branch 'master' of https://github.com/MrMasochism/Pixelmon