Changed default behavior of concentration binning
Cleaning up mock_factory
Changed API used to keep track of conc-mass relation