diff --git a/Gopkg.lock b/Gopkg.lock
index cc4e8c9fa..c0c8d30e1 100644
--- a/Gopkg.lock
+++ b/Gopkg.lock
@@ -3,14 +3,7 @@
 
 [[projects]]
   name = "cloud.google.com/go"
-  packages = [
-    "compute/metadata",
-    "iam",
-    "internal",
-    "internal/optional",
-    "internal/version",
-    "storage"
-  ]
+  packages = ["compute/metadata","iam","internal","internal/optional","internal/version","storage"]
   revision = "eaddaf6dd7ee35fd3c2420c8d27478db176b0485"
   version = "v0.15.0"
 
@@ -22,35 +15,7 @@
 
 [[projects]]
   name = "github.com/aws/aws-sdk-go"
-  packages = [
-    "aws",
-    "aws/awserr",
-    "aws/awsutil",
-    "aws/client",
-    "aws/client/metadata",
-    "aws/corehandlers",
-    "aws/credentials",
-    "aws/credentials/ec2rolecreds",
-    "aws/credentials/endpointcreds",
-    "aws/credentials/stscreds",
-    "aws/defaults",
-    "aws/ec2metadata",
-    "aws/endpoints",
-    "aws/request",
-    "aws/session",
-    "aws/signer/v4",
-    "internal/shareddefaults",
-    "private/protocol",
-    "private/protocol/query",
-    "private/protocol/query/queryutil",
-    "private/protocol/rest",
-    "private/protocol/restxml",
-    "private/protocol/xml/xmlutil",
-    "service/s3",
-    "service/s3/s3iface",
-    "service/s3/s3manager",
-    "service/sts"
-  ]
+  packages = ["aws","aws/awserr","aws/awsutil","aws/client","aws/client/metadata","aws/corehandlers","aws/credentials","aws/credentials/ec2rolecreds","aws/credentials/endpointcreds","aws/credentials/stscreds","aws/defaults","aws/ec2metadata","aws/endpoints","aws/request","aws/session","aws/signer/v4","internal/shareddefaults","private/protocol","private/protocol/query","private/protocol/query/queryutil","private/protocol/rest","private/protocol/restxml","private/protocol/xml/xmlutil","service/s3","service/s3/s3iface","service/s3/s3manager","service/sts"]
   revision = "f426770fd5a4bae6186b280d4af7dca83a4cdef4"
   version = "v1.12.17"
 
@@ -73,102 +38,29 @@
 
 [[projects]]
   name = "github.com/cloudfoundry/bosh-agent"
-  packages = [
-    "agentclient",
-    "agentclient/applyspec",
-    "agentclient/http"
-  ]
+  packages = ["agentclient","agentclient/applyspec","agentclient/http"]
   revision = "a74fc7069b604abe84f1ddd899f58ae1e6b1f8ee"
 
 [[projects]]
   name = "github.com/cloudfoundry/bosh-cli"
-  packages = [
-    "blobstore",
-    "cloud",
-    "cmd",
-    "cmd/config",
-    "common/net",
-    "common/util",
-    "config",
-    "cpi/release",
-    "crypto",
-    "deployment",
-    "deployment/disk",
-    "deployment/instance",
-    "deployment/instance/state",
-    "deployment/manifest",
-    "deployment/release",
-    "deployment/sshtunnel",
-    "deployment/template",
-    "deployment/vm",
-    "director",
-    "director/directorfakes",
-    "director/template",
-    "index",
-    "installation",
-    "installation/blobextract",
-    "installation/manifest",
-    "installation/pkg",
-    "installation/tarball",
-    "registry",
-    "release",
-    "release/job",
-    "release/job/manifest",
-    "release/license",
-    "release/manifest",
-    "release/pkg",
-    "release/pkg/manifest",
-    "release/resource",
-    "release/set/manifest",
-    "releasedir",
-    "releasedir/index",
-    "ssh",
-    "state/job",
-    "state/pkg",
-    "stemcell",
-    "templatescompiler",
-    "templatescompiler/erbrenderer",
-    "uaa",
-    "ui",
-    "ui/fmt",
-    "ui/table",
-    "ui/task",
-    "work"
-  ]
+  packages = ["blobstore","cloud","cmd","cmd/config","common/net","common/util","config","cpi/release","crypto","deployment","deployment/disk","deployment/instance","deployment/instance/state","deployment/manifest","deployment/release","deployment/sshtunnel","deployment/template","deployment/vm","director","director/directorfakes","director/template","index","installation","installation/blobextract","installation/manifest","installation/pkg","installation/tarball","registry","release","release/job","release/job/manifest","release/license","release/manifest","release/pkg","release/pkg/manifest","release/resource","release/set/manifest","releasedir","releasedir/index","ssh","state/job","state/pkg","stemcell","templatescompiler","templatescompiler/erbrenderer","uaa","ui","ui/fmt","ui/table","ui/task","work"]
   revision = "f58b3a1827c1f4359397485d781c16f102e4b430"
 
 [[projects]]
   name = "github.com/cloudfoundry/bosh-davcli"
-  packages = [
-    "client",
-    "config"
-  ]
+  packages = ["client","config"]
   revision = "81142822dc5f81b6c2af2e2f512be802f3d6f69c"
   version = "v0.0.26"
 
 [[projects]]
   name = "github.com/cloudfoundry/bosh-gcscli"
-  packages = [
-    "client",
-    "config"
-  ]
+  packages = ["client","config"]
   revision = "4ba9ac0dfb8b719a3812a11d8a934c962697935f"
   version = "v0.0.3"
 
 [[projects]]
   name = "github.com/cloudfoundry/bosh-utils"
-  packages = [
-    "blobstore",
-    "crypto",
-    "errors",
-    "fileutil",
-    "httpclient",
-    "logger",
-    "property",
-    "retrystrategy",
-    "system",
-    "uuid"
-  ]
+  packages = ["blobstore","crypto","errors","fileutil","httpclient","logger","property","retrystrategy","system","uuid"]
   revision = "a960ab178e64b43d19051be6fd2891ff695bb206"
 
 [[projects]]
@@ -177,11 +69,17 @@
   revision = "d29aa99b7c301778efea4714252b6ef549089d6b"
   version = "v0.0.124"
 
+[[projects]]
+  branch = "master"
+  name = "github.com/cloudfoundry/go-socks5"
+  packages = ["."]
+  revision = "54f73bdb8a8e85a6611d3d29ab9bbf98c2a060d7"
+
 [[projects]]
   branch = "master"
   name = "github.com/cloudfoundry/socks5-proxy"
   packages = ["."]
-  revision = "2b969c3ac9ea253dae3edb1bb36794ab6c6daf18"
+  revision = "3c6b4eec9c2d16c1dac4c42bdb5f755ba09daff8"
 
 [[projects]]
   branch = "master"
@@ -207,12 +105,6 @@
   revision = "570b54cabe6b8eb0bc2dfce68d964677d63b5260"
   version = "v1.5.0"
 
-[[projects]]
-  branch = "master"
-  name = "github.com/genevieve/go-socks5"
-  packages = ["."]
-  revision = "54f73bdb8a8e85a6611d3d29ab9bbf98c2a060d7"
-
 [[projects]]
   name = "github.com/go-ini/ini"
   packages = ["."]
@@ -222,14 +114,7 @@
 [[projects]]
   branch = "master"
   name = "github.com/golang/protobuf"
-  packages = [
-    "proto",
-    "protoc-gen-go/descriptor",
-    "ptypes",
-    "ptypes/any",
-    "ptypes/duration",
-    "ptypes/timestamp"
-  ]
+  packages = ["proto","protoc-gen-go/descriptor","ptypes","ptypes/any","ptypes/duration","ptypes/timestamp"]
   revision = "1643683e1b54a9e88ad26d98f81400c8c9d9f4f9"
 
 [[projects]]
@@ -282,45 +167,13 @@
 
 [[projects]]
   name = "github.com/onsi/ginkgo"
-  packages = [
-    ".",
-    "config",
-    "internal/codelocation",
-    "internal/containernode",
-    "internal/failer",
-    "internal/leafnodes",
-    "internal/remote",
-    "internal/spec",
-    "internal/spec_iterator",
-    "internal/specrunner",
-    "internal/suite",
-    "internal/testingtproxy",
-    "internal/writer",
-    "reporters",
-    "reporters/stenographer",
-    "reporters/stenographer/support/go-colorable",
-    "reporters/stenographer/support/go-isatty",
-    "types"
-  ]
+  packages = [".","config","internal/codelocation","internal/containernode","internal/failer","internal/leafnodes","internal/remote","internal/spec","internal/spec_iterator","internal/specrunner","internal/suite","internal/testingtproxy","internal/writer","reporters","reporters/stenographer","reporters/stenographer/support/go-colorable","reporters/stenographer/support/go-isatty","types"]
   revision = "9eda700730cba42af70d53180f9dcce9266bc2bc"
   version = "v1.4.0"
 
 [[projects]]
   name = "github.com/onsi/gomega"
-  packages = [
-    ".",
-    "format",
-    "internal/assertion",
-    "internal/asyncassertion",
-    "internal/oraclematcher",
-    "internal/testingtsupport",
-    "matchers",
-    "matchers/support/goraph/bipartitegraph",
-    "matchers/support/goraph/edge",
-    "matchers/support/goraph/node",
-    "matchers/support/goraph/util",
-    "types"
-  ]
+  packages = [".","format","internal/assertion","internal/asyncassertion","internal/oraclematcher","internal/testingtsupport","matchers","matchers/support/goraph/bipartitegraph","matchers/support/goraph/edge","matchers/support/goraph/node","matchers/support/goraph/util","types"]
   revision = "c893efa28eb45626cdaa76c9f653b62488858837"
   version = "v1.2.0"
 
@@ -332,10 +185,7 @@
 
 [[projects]]
   name = "github.com/pivotal-golang/s3cli"
-  packages = [
-    "client",
-    "config"
-  ]
+  packages = ["client","config"]
   revision = "90561c003f2f73d7cc61a013e5d84e08a75bc5b0"
   source = "github.com/cloudfoundry/bosh-s3cli"
 
@@ -348,161 +198,60 @@
 [[projects]]
   branch = "master"
   name = "github.com/vito/go-interact"
-  packages = [
-    "interact",
-    "interact/terminal"
-  ]
+  packages = ["interact","interact/terminal"]
   revision = "60caa86f173a89ef7a479fa400cc50faf6a2e369"
 
 [[projects]]
   branch = "master"
   name = "golang.org/x/crypto"
-  packages = [
-    "curve25519",
-    "ed25519",
-    "ed25519/internal/edwards25519",
-    "ssh",
-    "ssh/terminal"
-  ]
+  packages = ["curve25519","ed25519","ed25519/internal/edwards25519","ssh","ssh/terminal"]
   revision = "2509b142fb2b797aa7587dad548f113b2c0f20ce"
 
 [[projects]]
   branch = "master"
   name = "golang.org/x/net"
-  packages = [
-    "context",
-    "context/ctxhttp",
-    "html",
-    "html/atom",
-    "html/charset",
-    "http2",
-    "http2/hpack",
-    "idna",
-    "internal/timeseries",
-    "lex/httplex",
-    "proxy",
-    "trace"
-  ]
+  packages = ["context","context/ctxhttp","html","html/atom","html/charset","http2","http2/hpack","idna","internal/timeseries","lex/httplex","proxy","trace"]
   revision = "4b14673ba32bee7f5ac0f990a48f033919fd418b"
 
 [[projects]]
   branch = "master"
   name = "golang.org/x/oauth2"
-  packages = [
-    ".",
-    "google",
-    "internal",
-    "jws",
-    "jwt"
-  ]
+  packages = [".","google","internal","jws","jwt"]
   revision = "bb50c06baba3d0c76f9d125c0719093e315b5b44"
 
 [[projects]]
   branch = "master"
   name = "golang.org/x/sys"
-  packages = [
-    "unix",
-    "windows"
-  ]
+  packages = ["unix","windows"]
   revision = "607525c0eb3534cf37ade3d0f24fb9505c33caf3"
 
 [[projects]]
   branch = "master"
   name = "golang.org/x/text"
-  packages = [
-    "collate",
-    "collate/build",
-    "encoding",
-    "encoding/charmap",
-    "encoding/htmlindex",
-    "encoding/internal",
-    "encoding/internal/identifier",
-    "encoding/japanese",
-    "encoding/korean",
-    "encoding/simplifiedchinese",
-    "encoding/traditionalchinese",
-    "encoding/unicode",
-    "internal/colltab",
-    "internal/gen",
-    "internal/tag",
-    "internal/triegen",
-    "internal/ucd",
-    "internal/utf8internal",
-    "language",
-    "runes",
-    "secure/bidirule",
-    "transform",
-    "unicode/bidi",
-    "unicode/cldr",
-    "unicode/norm",
-    "unicode/rangetable"
-  ]
+  packages = ["collate","collate/build","encoding","encoding/charmap","encoding/htmlindex","encoding/internal","encoding/internal/identifier","encoding/japanese","encoding/korean","encoding/simplifiedchinese","encoding/traditionalchinese","encoding/unicode","internal/colltab","internal/gen","internal/tag","internal/triegen","internal/ucd","internal/utf8internal","language","runes","secure/bidirule","transform","unicode/bidi","unicode/cldr","unicode/norm","unicode/rangetable"]
   revision = "6eab0e8f74e86c598ec3b6fad4888e0c11482d48"
 
 [[projects]]
   branch = "master"
   name = "google.golang.org/api"
-  packages = [
-    "gensupport",
-    "googleapi",
-    "googleapi/internal/uritemplates",
-    "googleapi/transport",
-    "internal",
-    "iterator",
-    "option",
-    "storage/v1",
-    "transport/http"
-  ]
+  packages = ["gensupport","googleapi","googleapi/internal/uritemplates","googleapi/transport","internal","iterator","option","storage/v1","transport/http"]
   revision = "52fedcc3d56e51c5f1a571d48092238ab2746c73"
 
 [[projects]]
   name = "google.golang.org/appengine"
-  packages = [
-    ".",
-    "internal",
-    "internal/app_identity",
-    "internal/base",
-    "internal/datastore",
-    "internal/log",
-    "internal/modules",
-    "internal/remote_api",
-    "internal/urlfetch",
-    "urlfetch"
-  ]
+  packages = [".","internal","internal/app_identity","internal/base","internal/datastore","internal/log","internal/modules","internal/remote_api","internal/urlfetch","urlfetch"]
   revision = "150dc57a1b433e64154302bdc40b6bb8aefa313a"
   version = "v1.0.0"
 
 [[projects]]
   branch = "master"
   name = "google.golang.org/genproto"
-  packages = [
-    "googleapis/api/annotations",
-    "googleapis/iam/v1",
-    "googleapis/rpc/status"
-  ]
+  packages = ["googleapis/api/annotations","googleapis/iam/v1","googleapis/rpc/status"]
   revision = "f676e0f3ac6395ff1a529ae59a6670878a8371a6"
 
 [[projects]]
   name = "google.golang.org/grpc"
-  packages = [
-    ".",
-    "balancer",
-    "codes",
-    "connectivity",
-    "credentials",
-    "grpclb/grpc_lb_v1/messages",
-    "grpclog",
-    "internal",
-    "keepalive",
-    "metadata",
-    "naming",
-    "peer",
-    "resolver",
-    "stats",
-    "status",
-    "tap",
-    "transport"
-  ]
+  packages = [".","balancer","codes","connectivity","credentials","grpclb/grpc_lb_v1/messages","grpclog","internal","keepalive","metadata","naming","peer","resolver","stats","status","tap","transport"]
   revision = "f7bf885db0b7479a537ec317c6e48ce53145f3db"
   version = "v1.7.0"
 
diff --git a/vendor/github.com/genevieve/go-socks5/.gitignore b/vendor/github.com/cloudfoundry/go-socks5/.gitignore
similarity index 100%
rename from vendor/github.com/genevieve/go-socks5/.gitignore
rename to vendor/github.com/cloudfoundry/go-socks5/.gitignore
diff --git a/vendor/github.com/genevieve/go-socks5/.travis.yml b/vendor/github.com/cloudfoundry/go-socks5/.travis.yml
similarity index 100%
rename from vendor/github.com/genevieve/go-socks5/.travis.yml
rename to vendor/github.com/cloudfoundry/go-socks5/.travis.yml
diff --git a/vendor/github.com/genevieve/go-socks5/LICENSE b/vendor/github.com/cloudfoundry/go-socks5/LICENSE
similarity index 100%
rename from vendor/github.com/genevieve/go-socks5/LICENSE
rename to vendor/github.com/cloudfoundry/go-socks5/LICENSE
diff --git a/vendor/github.com/genevieve/go-socks5/README.md b/vendor/github.com/cloudfoundry/go-socks5/README.md
similarity index 100%
rename from vendor/github.com/genevieve/go-socks5/README.md
rename to vendor/github.com/cloudfoundry/go-socks5/README.md
diff --git a/vendor/github.com/genevieve/go-socks5/auth.go b/vendor/github.com/cloudfoundry/go-socks5/auth.go
similarity index 100%
rename from vendor/github.com/genevieve/go-socks5/auth.go
rename to vendor/github.com/cloudfoundry/go-socks5/auth.go
diff --git a/vendor/github.com/genevieve/go-socks5/auth_test.go b/vendor/github.com/cloudfoundry/go-socks5/auth_test.go
similarity index 100%
rename from vendor/github.com/genevieve/go-socks5/auth_test.go
rename to vendor/github.com/cloudfoundry/go-socks5/auth_test.go
diff --git a/vendor/github.com/genevieve/go-socks5/credentials.go b/vendor/github.com/cloudfoundry/go-socks5/credentials.go
similarity index 100%
rename from vendor/github.com/genevieve/go-socks5/credentials.go
rename to vendor/github.com/cloudfoundry/go-socks5/credentials.go
diff --git a/vendor/github.com/genevieve/go-socks5/credentials_test.go b/vendor/github.com/cloudfoundry/go-socks5/credentials_test.go
similarity index 100%
rename from vendor/github.com/genevieve/go-socks5/credentials_test.go
rename to vendor/github.com/cloudfoundry/go-socks5/credentials_test.go
diff --git a/vendor/github.com/genevieve/go-socks5/request.go b/vendor/github.com/cloudfoundry/go-socks5/request.go
similarity index 100%
rename from vendor/github.com/genevieve/go-socks5/request.go
rename to vendor/github.com/cloudfoundry/go-socks5/request.go
diff --git a/vendor/github.com/genevieve/go-socks5/request_test.go b/vendor/github.com/cloudfoundry/go-socks5/request_test.go
similarity index 100%
rename from vendor/github.com/genevieve/go-socks5/request_test.go
rename to vendor/github.com/cloudfoundry/go-socks5/request_test.go
diff --git a/vendor/github.com/genevieve/go-socks5/resolver.go b/vendor/github.com/cloudfoundry/go-socks5/resolver.go
similarity index 100%
rename from vendor/github.com/genevieve/go-socks5/resolver.go
rename to vendor/github.com/cloudfoundry/go-socks5/resolver.go
diff --git a/vendor/github.com/genevieve/go-socks5/resolver_test.go b/vendor/github.com/cloudfoundry/go-socks5/resolver_test.go
similarity index 100%
rename from vendor/github.com/genevieve/go-socks5/resolver_test.go
rename to vendor/github.com/cloudfoundry/go-socks5/resolver_test.go
diff --git a/vendor/github.com/genevieve/go-socks5/ruleset.go b/vendor/github.com/cloudfoundry/go-socks5/ruleset.go
similarity index 100%
rename from vendor/github.com/genevieve/go-socks5/ruleset.go
rename to vendor/github.com/cloudfoundry/go-socks5/ruleset.go
diff --git a/vendor/github.com/genevieve/go-socks5/ruleset_test.go b/vendor/github.com/cloudfoundry/go-socks5/ruleset_test.go
similarity index 100%
rename from vendor/github.com/genevieve/go-socks5/ruleset_test.go
rename to vendor/github.com/cloudfoundry/go-socks5/ruleset_test.go
diff --git a/vendor/github.com/genevieve/go-socks5/socks5.go b/vendor/github.com/cloudfoundry/go-socks5/socks5.go
similarity index 100%
rename from vendor/github.com/genevieve/go-socks5/socks5.go
rename to vendor/github.com/cloudfoundry/go-socks5/socks5.go
diff --git a/vendor/github.com/genevieve/go-socks5/socks5_test.go b/vendor/github.com/cloudfoundry/go-socks5/socks5_test.go
similarity index 100%
rename from vendor/github.com/genevieve/go-socks5/socks5_test.go
rename to vendor/github.com/cloudfoundry/go-socks5/socks5_test.go
diff --git a/vendor/github.com/cloudfoundry/socks5-proxy/Gopkg.lock b/vendor/github.com/cloudfoundry/socks5-proxy/Gopkg.lock
index 53ab66236..f51c03179 100644
--- a/vendor/github.com/cloudfoundry/socks5-proxy/Gopkg.lock
+++ b/vendor/github.com/cloudfoundry/socks5-proxy/Gopkg.lock
@@ -3,7 +3,7 @@
 
 [[projects]]
   branch = "master"
-  name = "github.com/genevieve/go-socks5"
+  name = "github.com/cloudfoundry/go-socks5"
   packages = ["."]
   revision = "54f73bdb8a8e85a6611d3d29ab9bbf98c2a060d7"
 
@@ -52,6 +52,6 @@
 [solve-meta]
   analyzer-name = "dep"
   analyzer-version = 1
-  inputs-digest = "c7b571fa133572ad7fe5965df4478a2f05637d2ff892012fd24502d6899161db"
+  inputs-digest = "5972c1691df9a5e431048f0fdfde2b15e496fec464284cd3913181bad3496331"
   solver-name = "gps-cdcl"
   solver-version = 1
diff --git a/vendor/github.com/cloudfoundry/socks5-proxy/socks5_proxy.go b/vendor/github.com/cloudfoundry/socks5-proxy/socks5_proxy.go
index 5e7005153..14bfa11d5 100644
--- a/vendor/github.com/cloudfoundry/socks5-proxy/socks5_proxy.go
+++ b/vendor/github.com/cloudfoundry/socks5-proxy/socks5_proxy.go
@@ -6,11 +6,12 @@ import (
 	"net"
 	"strconv"
 
-	socks5 "github.com/genevieve/go-socks5"
+	socks5 "github.com/cloudfoundry/go-socks5"
+
+	"log"
 
 	"golang.org/x/crypto/ssh"
 	"golang.org/x/net/context"
-	"log"
 )
 
 var netListen = net.Listen