Added proxy support
Removed redundant option that had stuck around.
PEP8 fixes
trailing whitespace
next time I'll just paste things over, even if it's just two lines...
make that three lines... *sigh*
Note to self: don't do Java before Python
Minor refactor of proxy host/port changes

* Add tests for runnig via proxy host
* Raise exception when pycurl is unavailable and proxy host is used
* Always use curl http client when pycurl is installed
* Update travis and ansible playbook to install pycurl
Merge branch 'sapo-master'