* master:
  Rescale Phi when sampling in BASiCSSimulate
  Adjust BASiCSSimulate to match devel BASiCS