Merge remote-tracking branch 'origin/master' into changing_namespace

# Conflicts:
#	.gitlab-ci.yml

.gitlab-ci.yml

@@ -67,7 +67,7 @@ pages:
   script:
     - mkdir public/
     - mv htmlcov/ public/
-    - mv /builds/lscsoft/bilby/coverage_badge.svg public/
+    - mv coverage_badge.svg public/
     - mv docs/_build/html/* public/
   artifacts:
     paths:

CHANGELOG.md

@@ -94,7 +94,7 @@ re-instantiate the Prior in most cases
 
 ### Added
 - InterferometerStrainData now handles both time-domain and frequencu-domain data
-- Adds documentation on setting data (https://monash.docs.ligo.org/bilby/transient-gw-data.html)
+- Adds documentation on setting data (https://lscsoft.docs.ligo.org/bilby/transient-gw-data.html)
 - Checkpointing for `dynesty`: the sampling will be checkpointed every 10 minutes (approximately) and can be resumed.
 - Add functionality to plot multiple results in a corner plot, see `bilby.core.result.plot_multiple()`.
 - Likelihood evaluations are now saved along with the posteriors.
@@ -121,9 +121,8 @@ First `pip` installable version https://pypi.org/project/BILBY/ .
 - Major effort to update all docstrings and add some documentation.
 - Marginalized likelihoods.
 - Examples of searches for gravitational waves from a Supernova and using a sine-Gaussian.
-- A `PriorSet` to handle sets of priors and allows reading in from a standardised prior file (see https://monash.docs.ligo.org/bilby/prior.html).
+- A `PriorSet` to handle sets of priors and allows reading in from a standardised prior file (see https://lscsoft.docs.ligo.org/bilby/prior.html).
 - A standardised file for storing detector data.
 
 ### Removed
 - All chainconsumer dependency as this was causing issues.
-

CONTRIBUTING.md

@@ -28,7 +28,7 @@ $ python setup.py develop
 which will install `bilby` and, because we used `develop` instead of `install`
 when you change the code your installed version will automatically be updated.
 
---- 
+---
 
 #### Removing previously installed versions
 
@@ -157,11 +157,10 @@ you should:
 
 ## Code overview
 
-In this section, we'll give an overview of how the code is structured. This is intended to help orient users and make it easier to contribute. The layout is intended to define the logic of the code and new merge requests should aim to fit within this logic (unless there is a good argument to change it). For example, code which adds a new sampler should not effect the gravitational-wave specific parts of the code. Note that this document is not programatically generated and so may get out of date with time. If you notice something wrong, please open an issue. 
+In this section, we'll give an overview of how the code is structured. This is intended to help orient users and make it easier to contribute. The layout is intended to define the logic of the code and new merge requests should aim to fit within this logic (unless there is a good argument to change it). For example, code which adds a new sampler should not effect the gravitational-wave specific parts of the code. Note that this document is not programatically generated and so may get out of date with time. If you notice something wrong, please open an issue.
 
 ### Bilby Code Layout
 
 ![bilby overview](docs/images/bilby_layout.png)
 
 Note this layout is not comprehensive, for example only a few example "Priors" are shown.
-