Fixed bug where recombination rate per diploid per generation was cut in half.  Classic over-thinking
Merge branches 'dev' and 'master'
Merge branch 'master' of https://github.com/molpopgen/fwdpp into molpopgen-master

Conflicts:
	fwdpp/recombination_methods_ind.hpp