add http_proxy settings
add HTTPS_PROXY setting
Merge pull request #1349 from aronasorman/846

#846: Add http{,s}_proxy settings.