Update URLs to be HTTPS where possible
Merge branch 'master' into gh-pages