trying to get a proxy working
got more proxy testing working
got the proxy server working in osx
Merge remote-tracking branch 'origin/proxy_testing'

Conflicts:
	requirements.txt
	tests/selenium/integration_test.py