Updated proxy settings for clarity Issue #4
* Changed the name of the config options
* Removed proxy_type
* Set enable_proxy to default to False
* added proxy_settings with a hash for http and https proxy configs
Merge branch 'master' into issue-4-proxy
Merge pull request #8 from TJM/issue-4-proxy

Updated proxy settings for clarity Issue #4