Second part of SSL to HTTPS change.

Continuation of changes for #130