Merge pull request #255 from Jay2645/master

Modified Random Battle code to prevent unfair teams.
Revise random battle changes for PS coding style
Refactor randbat team generator
The main difference here is that the evolution family restriction
has been replaced with a 'limit one of each type combo' restriction.

Every other change is just refactoring.
Corrected typo in comments for Basculin.