Merge remote-tracking branch 'hoatle/bug_55_fix_broken_links_on_docs' into develop
Ignore README.rst and .travis.yml as it's different between branches