Isolating genotype bugs.
Merge branch 'master' of https://github.com/simm2/hungry_monsters

Conflicts:
	alon/simulate.py