Add http and https proxy options
Merge pull request #2368 from bkochendorfer/add_proxy_support

Add http and https proxy options