Merge branch 'http_proxy_option'

Httplib replaced by urllib2.