Merge branch 'master' into combine_samples

CHANGELOG.md

bilby/core/prior.py

bilby/core/result.py

bilby/core/sampler/__init__.py

bilby/core/sampler/cpnest.py

bilby/core/sampler/dynesty.py

bilby/core/sampler/emcee.py

bilby/core/sampler/proposal.py

bilby/core/sampler/ptemcee.py

bilby/core/series.py

bilby/gw/calibration.py

bilby/gw/likelihood.py

bilby/gw/prior.py

bilby/gw/prior_files/GW150914.prior

bilby/gw/prior_files/aligned_spin_binary_black_holes.prior

bilby/gw/prior_files/binary_black_holes.prior

bilby/gw/prior_files/binary_neutron_stars.prior

bilby/gw/sampler/__init__.py

bilby/gw/sampler/proposal.py

bilby/gw/utils.py