Fixed bug where recombination rate per diploid per generation was cut in half.  Classic over-thinking
Merge branches 'dev' and 'master'