Fixed error in assert in sample_diploid (ind. based, single deme).  Rearranged some code in metapop version of same function to make future changes less error-prone