Fixed Gengar, lowered Zubat a bit, Added flapping to Aero
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'

Conflicts:
	minecraft/pixelmon/client/models/pokemon/ModelAerodactyl.java
	minecraft/pixelmon/client/models/pokemon/ModelZubat.java
Added in trainers, graveler
fix to littlebodyswimmer
Four new trainers added
new pidgey
Merge remote-tracking branch 'origin/master'
Fixes and added Archeops
Merge pull request #705 from LightAdept/master

Mostly fixes and trainers