Manually added ghostwolf's fixes
Merge branch 'master' of https://github.com/MrMasochism/Pixelmon