Generalizing to fit Lirong's model

All updated to fit Lirong's model. Different parameters can now be set,
so it's not stuck on the standard Mallows model.