updated estimateCellCounts for 2 classes

previous code could not estimate composition for 2 cellular
compositions. there were also issues with extraneous phenotype data
causing problems in the combining step for a second flow sorted dataset