diff --git a/tools/Gopkg.lock b/tools/Gopkg.lock
index ba42ba9bf97b..92fe1e260caf 100644
--- a/tools/Gopkg.lock
+++ b/tools/Gopkg.lock
@@ -1,15 +1,56 @@
 # This file is autogenerated, do not edit; changes may be undone by the next 'dep ensure'.
 
 
+[[projects]]
+  name = "github.com/alecthomas/gometalinter"
+  packages = ["."]
+  revision = "46cc1ea3778b247666c2949669a3333c532fa9c6"
+  version = "v2.0.5"
+
 [[projects]]
   branch = "master"
-  name = "github.com/rigelrozanski/common"
+  name = "github.com/alecthomas/units"
+  packages = ["."]
+  revision = "2efee857e7cfd4f3d0138cc3cbb1b4966962b93a"
+
+[[projects]]
+  branch = "master"
+  name = "github.com/google/shlex"
+  packages = ["."]
+  revision = "6f45313302b9c56850fc17f99e40caebce98c716"
+
+[[projects]]
+  name = "github.com/nicksnyder/go-i18n"
+  packages = [
+    "i18n",
+    "i18n/bundle",
+    "i18n/language",
+    "i18n/translation"
+  ]
+  revision = "0dc1626d56435e9d605a29875701721c54bc9bbd"
+  version = "v1.10.0"
+
+[[projects]]
+  name = "github.com/pelletier/go-toml"
+  packages = ["."]
+  revision = "acdc4509485b587f5e675510c4f2c63e90ff68a8"
+  version = "v1.1.0"
+
+[[projects]]
+  branch = "v3-unstable"
+  name = "gopkg.in/alecthomas/kingpin.v3-unstable"
+  packages = ["."]
+  revision = "b8d601de6db1f3b56a99ffe9051eb708574bc1cd"
+
+[[projects]]
+  name = "gopkg.in/yaml.v2"
   packages = ["."]
-  revision = "f691f115798593d783b9999b1263c2f4ffecc439"
+  revision = "7f97868eec74b32b0982dd158a51a446d1da7eb5"
+  version = "v2.1.1"
 
 [solve-meta]
   analyzer-name = "dep"
   analyzer-version = 1
-  inputs-digest = "d94d5d70f00be97bb05e110d607c4d4de794e25111377b02078891bf494e38e1"
+  inputs-digest = "bb8cda576a5c4dda202435f43a46ae50a254181a4bf22c6af6f4d3d03079d509"
   solver-name = "gps-cdcl"
   solver-version = 1
diff --git a/tools/Gopkg.toml b/tools/Gopkg.toml
index 2e03fd48283c..97fb629752ce 100644
--- a/tools/Gopkg.toml
+++ b/tools/Gopkg.toml
@@ -24,11 +24,11 @@
 #   go-tests = true
 #   unused-packages = true
 
-
 [[constraint]]
-  branch = "master"
-  name = "github.com/rigelrozanski/common"
+  name = "github.com/alecthomas/gometalinter"
+  version = "2.0.5"
 
 [prune]
   go-tests = true
   unused-packages = true
+
diff --git a/tools/Makefile b/tools/Makefile
index 6dbf64af49f0..b35339048e10 100644
--- a/tools/Makefile
+++ b/tools/Makefile
@@ -44,9 +44,6 @@ install: get_vendor_deps
 	@echo "$(ansi_yel)Install gometalinter.v2$(ansi_end)"
 	GOBIN=$(CURDIR)/bin ./bin/go-vendorinstall github.com/alecthomas/gometalinter
 
-	@echo "$(ansi_yel)Install shelldown$(ansi_end)"
-	GOBIN=$(CURDIR)/bin ./bin/go-vendorinstall github.com/rigelrozanski/shelldown/cmd/shelldown
-
 	@echo "$(ansi_grn)Done installing tools$(ansi_end)"
 
 
diff --git a/tools/main.go b/tools/main.go
index 3993b4a042f3..b891a9c7555f 100644
--- a/tools/main.go
+++ b/tools/main.go
@@ -6,7 +6,7 @@ import (
 
 	// TODO: Ideally this gets auto-imported on dep update.
 	// Any way to make that happen?
-	_ "github.com/rigelrozanski/common"
+	_ "github.com/alecthomas/gometalinter"
 )
 
 func main() {}