Added gens_since_bneck variable to keep track of growth after the bottleneck.  Prior version was using the generations variable, which results in integer overflow.
Merge branches 'bugfix' and 'master'