Merge branch 'master' into improve-versino-information

bilby/__init__.py

bilby/core/prior/conditional.py

bilby/core/prior/dict.py

bilby/core/prior/interpolated.py

bilby/core/prior/joint.py

bilby/core/sampler/pymultinest.py

bilby/core/utils.py

bilby/gw/conversion.py

bilby/gw/detector/strain_data.py

bilby/gw/likelihood.py

bilby/gw/prior.py

docs/bilby-output.txt

docs/dynesty-guide.txt

docs/examples.txt

docs/faq.txt

docs/gw_prior.txt

docs/index.txt

docs/installation.txt

docs/prior.txt

test/gw_prior_test.py