Starting to revamp make_mocks (currently broken) to accommodate new models. Also added 2-halo assembly bias ho model.