Redirected links (rebased onto develop)

This is the same as gh-257 but rebased onto develop. Also includes the single commit from gh-272 necessary to rebase without conflict.

----

This PR fixes many redirected links across the doc in order to minimize the content of `_build/linkcheck/output.txt`