Fix up how we set our upstream proxy
Merge pull request #245 from VictorLowther/fix-upstream-proxy-support

Fix up how we set our upstream proxy