Develop

Halo_occupation module now contains classes for models that contain both inflection and conformity.