Fixed air in battles from reducing
Removed the ability to leash pokemon
Merge branch 'master' of https://github.com/MrMasochism/Pixelmon