Change readthedocs.org links
Merge branch 'master' into fix/update-rtd-links
Merge branch 'master' into fix/update-rtd-links

Conflicts:
	README.rst
Merge branch 'master' into fix/update-rtd-links

Conflicts:
	README.rst
Merge branch 'fix/update-rtd-links'