Make sure we pass proxy info wherever it is needed
Merge pull request #68 from VictorLowther/fix-proxy-handling

Make sure we pass proxy info wherever it is needed