Toggle http/https where necessary
Merge pull request #23 from borkweb/handle-https

Toggle http/https where necessary