Merge pull request #1007 from LightAdept/master

Rest of the nido's and ponyta remake
fixed gen of evolution rocks
increased hardness of rocks
made it so pokemon only drop items if defeated in battle
Merge branch 'master' of https://github.com/MrMasochism/Pixelmon
Merge pull request #1011 from LightAdept/master

Carracosta and magmar
New Abra, small fix to Tirtouga
Merge remote-tracking branch 'origin/master'
Electabuzz and bulbasaur