Changes to make_mixture function.

Changed the output so that the mixture and the bline come out in the same format (not in 0s,1s,and 2s).  Also fixed a few things so that contaminated samples can be selected by specifying id names.