Allow proxy settings to include protocol

http_proxy & https_proxy settings can now be specified with or without
the protocol prefix.
Correct https test
Merge pull request #539 from timrwilliams/master

Allow proxy configuration settings to include protocol