diff --git a/Godeps b/Godeps
index 188e3cfb6b..ff5c27b0f2 100644
--- a/Godeps
+++ b/Godeps
@@ -1,15 +1,15 @@
-collectd.org e84e8af5356e7f47485bbc95c96da6dd7984a67e
+collectd.org 2ce144541b8903101fb8f1483cc0497a68798122
 github.com/BurntSushi/toml a368813c5e648fee92e5f6c30e3944ff9d5e8895
-github.com/RoaringBitmap/roaring cefad6e4f79d4fa5d1d758ff937dde300641ccfa
+github.com/RoaringBitmap/roaring d6540aab65a17321470b1661bfc52da1823871e9
 github.com/beorn7/perks 4c0e84591b9aa9e6dcfdf3e020114cd81f89d5f9
 github.com/bmizerany/pat c068ca2f0aacee5ac3681d68e4d0a003b7d1fd2c
-github.com/boltdb/bolt 4b1ebc1869ad66568b313d0dc410e2be72670dda
-github.com/cespare/xxhash 1b6d2e40c16ba0dfce5c8eac2480ad6e7394819b
+github.com/boltdb/bolt 2f1ce7a837dcb8da3ec595b1dac9d0632f0f99e8
+github.com/cespare/xxhash 5c37fe3735342a2e0d01c87a907579987c8936cc
 github.com/davecgh/go-spew 346938d642f2ec3594ed81d874461961cd0faa76
-github.com/dgrijalva/jwt-go 24c63f56522a87ec5339cc3567883f1039378fdb
+github.com/dgrijalva/jwt-go 06ea1031745cb8b3dab3f6a236daf2b0aa468b7e
 github.com/dgryski/go-bitstream 7d46cd22db7004f0cceb6f7975824b560cf0e486
 github.com/glycerine/go-unsnap-stream 62a9a9eb44fd8932157b1a8ace2149eff5971af6
-github.com/gogo/protobuf 1c2b16bc280d6635de6c52fc1471ab962dc36ec9
+github.com/gogo/protobuf 1adfc126b41513cc696b209667c8656ea7aac67c
 github.com/golang/protobuf 1e59b77b52bf8e4b449a57e6f79f21226d571845
 github.com/golang/snappy d9eb7a3d35ec988b8585d4a0068e462c27d28380
 github.com/google/go-cmp 18107e6c56edb2d51f965f7d68e59404f0daee54
@@ -17,20 +17,22 @@ github.com/influxdata/influxql 53bc9c15f65bea9e4b9f6cc5d9c5327d4077bdc5
 github.com/influxdata/usage-client 6d3895376368aa52a3a81d2a16e90f0f52371967
 github.com/influxdata/yamux 1f58ded512de5feabbe30b60c7d33a7a896c5f16
 github.com/influxdata/yarpc 036268cdec22b7074cd6d50cc6d7315c667063c7
-github.com/jsternberg/zap-logfmt 5ea53862c7fa897f44ae0b3004283308c0b0c9d1
+github.com/jsternberg/zap-logfmt ac4bd917e18a4548ce6e0e765b29a4e7f397b0b6
 github.com/jwilder/encoding 27894731927e49b0a9023f00312be26733744815
 github.com/mattn/go-isatty 6ca4dbf54d38eea1a992b3c722a76a5d1c4cb25c
 github.com/matttproud/golang_protobuf_extensions c12348ce28de40eed0136aa2b644d0ee0650e56c
-github.com/opentracing/opentracing-go 1361b9cd60be79c4c3a7fa9841b3c132e40066a7
-github.com/paulbellamy/ratecounter 5a11f585a31379765c190c033b6ad39956584447
+github.com/mschoch/smat 90eadee771aeab36e8bf796039b8c261bebebe4f
+github.com/opentracing/opentracing-go 328fceb7548c744337cd010914152b74eaf4c4ab
+github.com/paulbellamy/ratecounter 524851a93235ac051e3540563ed7909357fe24ab
 github.com/peterh/liner 88609521dc4b6c858fd4c98b628147da928ce4ac
 github.com/philhofer/fwd 1612a298117663d7bc9a760ae20d383413859798
 github.com/prometheus/client_golang 661e31bf844dfca9aeba15f27ea8aa0d485ad212
 github.com/prometheus/client_model 99fa1f4be8e564e8a6b613da7fa6f46c9edafc6c
 github.com/prometheus/common 2e54d0b93cba2fd133edc32211dcc32c06ef72ca
 github.com/prometheus/procfs a6e9df898b1336106c743392c48ee0b71f5c4efa
-github.com/retailnext/hllpp 38a7bb71b483e855d35010808143beaf05b67f9d
-github.com/tinylib/msgp ad0ff2e232ad2e37faf67087fb24bf8d04a8ce20
+github.com/retailnext/hllpp 101a6d2f8b52abfc409ac188958e7e7be0116331
+github.com/tinylib/msgp b2b6a672cf1e5b90748f79b8b81fc8c5cf0571a1
+github.com/willf/bitset d860f346b89450988a379d7d705e83c58d1ea227
 github.com/xlab/treeprint 06dfc6fa17cdde904617990a0c2d89e3e332dbb3
 go.uber.org/atomic 54f72d32435d760d5604f17a82e2435b28dc4ba5
 go.uber.org/multierr fb7d312c2c04c34f0ad621048bbb953b168f9ff6
diff --git a/Gopkg.lock b/Gopkg.lock
index bea1ebd167..9e4c68f6cc 100644
--- a/Gopkg.lock
+++ b/Gopkg.lock
@@ -8,9 +8,11 @@
     "cdtime",
     "network"
   ]
-  revision = "e84e8af5356e7f47485bbc95c96da6dd7984a67e"
+  revision = "2ce144541b8903101fb8f1483cc0497a68798122"
+  version = "v0.3.0"
 
 [[projects]]
+  branch = "master"
   name = "github.com/BurntSushi/toml"
   packages = ["."]
   revision = "a368813c5e648fee92e5f6c30e3944ff9d5e8895"
@@ -18,7 +20,8 @@
 [[projects]]
   name = "github.com/RoaringBitmap/roaring"
   packages = ["."]
-  revision = "cefad6e4f79d4fa5d1d758ff937dde300641ccfa"
+  revision = "d6540aab65a17321470b1661bfc52da1823871e9"
+  version = "v0.4.3"
 
 [[projects]]
   name = "github.com/beorn7/perks"
@@ -33,12 +36,14 @@
 [[projects]]
   name = "github.com/boltdb/bolt"
   packages = ["."]
-  revision = "4b1ebc1869ad66568b313d0dc410e2be72670dda"
+  revision = "2f1ce7a837dcb8da3ec595b1dac9d0632f0f99e8"
+  version = "v1.3.1"
 
 [[projects]]
   name = "github.com/cespare/xxhash"
   packages = ["."]
-  revision = "1b6d2e40c16ba0dfce5c8eac2480ad6e7394819b"
+  revision = "5c37fe3735342a2e0d01c87a907579987c8936cc"
+  version = "v1.0.0"
 
 [[projects]]
   name = "github.com/davecgh/go-spew"
@@ -48,7 +53,8 @@
 [[projects]]
   name = "github.com/dgrijalva/jwt-go"
   packages = ["."]
-  revision = "24c63f56522a87ec5339cc3567883f1039378fdb"
+  revision = "06ea1031745cb8b3dab3f6a236daf2b0aa468b7e"
+  version = "v3.2.0"
 
 [[projects]]
   name = "github.com/dgryski/go-bitstream"
@@ -70,7 +76,8 @@
     "sortkeys",
     "types"
   ]
-  revision = "1c2b16bc280d6635de6c52fc1471ab962dc36ec9"
+  revision = "1adfc126b41513cc696b209667c8656ea7aac67c"
+  version = "v1.0.0"
 
 [[projects]]
   name = "github.com/golang/protobuf"
@@ -93,7 +100,6 @@
   revision = "18107e6c56edb2d51f965f7d68e59404f0daee54"
 
 [[projects]]
-  branch = "master"
   name = "github.com/influxdata/influxql"
   packages = [
     ".",
@@ -124,7 +130,8 @@
 [[projects]]
   name = "github.com/jsternberg/zap-logfmt"
   packages = ["."]
-  revision = "5ea53862c7fa897f44ae0b3004283308c0b0c9d1"
+  revision = "ac4bd917e18a4548ce6e0e765b29a4e7f397b0b6"
+  version = "v1.0.0"
 
 [[projects]]
   name = "github.com/jwilder/encoding"
@@ -132,6 +139,7 @@
   revision = "27894731927e49b0a9023f00312be26733744815"
 
 [[projects]]
+  branch = "master"
   name = "github.com/mattn/go-isatty"
   packages = ["."]
   revision = "6ca4dbf54d38eea1a992b3c722a76a5d1c4cb25c"
@@ -148,18 +156,20 @@
   revision = "90eadee771aeab36e8bf796039b8c261bebebe4f"
 
 [[projects]]
+  branch = "master"
   name = "github.com/opentracing/opentracing-go"
   packages = [
     ".",
     "ext",
     "log"
   ]
-  revision = "1361b9cd60be79c4c3a7fa9841b3c132e40066a7"
+  revision = "328fceb7548c744337cd010914152b74eaf4c4ab"
 
 [[projects]]
   name = "github.com/paulbellamy/ratecounter"
   packages = ["."]
-  revision = "5a11f585a31379765c190c033b6ad39956584447"
+  revision = "524851a93235ac051e3540563ed7909357fe24ab"
+  version = "v0.2.0"
 
 [[projects]]
   name = "github.com/peterh/liner"
@@ -202,14 +212,16 @@
   revision = "a6e9df898b1336106c743392c48ee0b71f5c4efa"
 
 [[projects]]
+  branch = "master"
   name = "github.com/retailnext/hllpp"
   packages = ["."]
-  revision = "38a7bb71b483e855d35010808143beaf05b67f9d"
+  revision = "101a6d2f8b52abfc409ac188958e7e7be0116331"
 
 [[projects]]
   name = "github.com/tinylib/msgp"
   packages = ["msgp"]
-  revision = "ad0ff2e232ad2e37faf67087fb24bf8d04a8ce20"
+  revision = "b2b6a672cf1e5b90748f79b8b81fc8c5cf0571a1"
+  version = "1.0.2"
 
 [[projects]]
   name = "github.com/willf/bitset"
@@ -244,6 +256,7 @@
     "zaptest/observer"
   ]
   revision = "35aad584952c3e7020db7b839f6b102de6271f89"
+  version = "v1.7.1"
 
 [[projects]]
   name = "golang.org/x/crypto"
@@ -292,6 +305,6 @@
 [solve-meta]
   analyzer-name = "dep"
   analyzer-version = 1
-  inputs-digest = "3baaaa0663cc9e763da37b23e154b367e6bb0364da34c91cb4daf02fedf2dfc5"
+  inputs-digest = "a5da843ef395612bf314e73c8edc9605e55fd0428a73fe8e94370caa17231cb2"
   solver-name = "gps-cdcl"
   solver-version = 1
diff --git a/Gopkg.toml b/Gopkg.toml
index 0ff0c83c79..c8a344f973 100644
--- a/Gopkg.toml
+++ b/Gopkg.toml
@@ -1,174 +1,66 @@
 [[constraint]]
   name = "collectd.org"
-  revision = "e84e8af5356e7f47485bbc95c96da6dd7984a67e"
+  version = "0.3.0"
 
 [[constraint]]
   name = "github.com/BurntSushi/toml"
-  revision = "a368813c5e648fee92e5f6c30e3944ff9d5e8895"
+  branch = "master"
 
 [[constraint]]
   name = "github.com/RoaringBitmap/roaring"
-  revision = "cefad6e4f79d4fa5d1d758ff937dde300641ccfa"
-
-[[override]]
-  name = "github.com/beorn7/perks"
-  revision = "4c0e84591b9aa9e6dcfdf3e020114cd81f89d5f9"
-
-[[constraint]]
-  name = "github.com/bmizerany/pat"
-  revision = "c068ca2f0aacee5ac3681d68e4d0a003b7d1fd2c"
+  version = "0.4.3"
 
 [[constraint]]
   name = "github.com/boltdb/bolt"
-  revision = "4b1ebc1869ad66568b313d0dc410e2be72670dda"
+  version = "1.3.1"
 
 [[constraint]]
   name = "github.com/cespare/xxhash"
-  revision = "1b6d2e40c16ba0dfce5c8eac2480ad6e7394819b"
-
-[[constraint]]
-  name = "github.com/davecgh/go-spew"
-  revision = "346938d642f2ec3594ed81d874461961cd0faa76"
+  version = "1.0.0"
 
 [[constraint]]
   name = "github.com/dgrijalva/jwt-go"
-  revision = "24c63f56522a87ec5339cc3567883f1039378fdb"
-
-[[constraint]]
-  name = "github.com/dgryski/go-bitstream"
-  revision = "7d46cd22db7004f0cceb6f7975824b560cf0e486"
-
-[[override]]
-  name = "github.com/glycerine/go-unsnap-stream"
-  revision = "62a9a9eb44fd8932157b1a8ace2149eff5971af6"
+  version = "3.2.0"
 
 [[constraint]]
   name = "github.com/gogo/protobuf"
-  revision = "1c2b16bc280d6635de6c52fc1471ab962dc36ec9"
-
-[[override]]
-  name = "github.com/golang/protobuf"
-  revision = "1e59b77b52bf8e4b449a57e6f79f21226d571845"
+  version = "1.0.0"
 
 [[constraint]]
   name = "github.com/golang/snappy"
   revision = "d9eb7a3d35ec988b8585d4a0068e462c27d28380"
 
-[[constraint]]
-  name = "github.com/google/go-cmp"
-  revision = "18107e6c56edb2d51f965f7d68e59404f0daee54"
-
 [[constraint]]
   name = "github.com/influxdata/influxql"
-  branch = "master"
-
-[[constraint]]
-  name = "github.com/influxdata/usage-client"
-  revision = "6d3895376368aa52a3a81d2a16e90f0f52371967"
-
-[[override]]
-  name = "github.com/influxdata/yamux"
-  revision = "1f58ded512de5feabbe30b60c7d33a7a896c5f16"
-
-[[constraint]]
-  name = "github.com/influxdata/yarpc"
-  revision = "036268cdec22b7074cd6d50cc6d7315c667063c7"
-
-[[constraint]]
-  name = "github.com/jsternberg/zap-logfmt"
-  revision = "5ea53862c7fa897f44ae0b3004283308c0b0c9d1"
-
-[[constraint]]
-  name = "github.com/jwilder/encoding"
-  revision = "27894731927e49b0a9023f00312be26733744815"
+  revision = "53bc9c15f65bea9e4b9f6cc5d9c5327d4077bdc5"
 
 [[constraint]]
   name = "github.com/mattn/go-isatty"
-  revision = "6ca4dbf54d38eea1a992b3c722a76a5d1c4cb25c"
-
-[[override]]
-  name = "github.com/matttproud/golang_protobuf_extensions"
-  revision = "c12348ce28de40eed0136aa2b644d0ee0650e56c"
+  branch = "master"
 
 [[constraint]]
   name = "github.com/opentracing/opentracing-go"
-  revision = "1361b9cd60be79c4c3a7fa9841b3c132e40066a7"
+  branch = "master"
 
 [[constraint]]
   name = "github.com/paulbellamy/ratecounter"
-  revision = "5a11f585a31379765c190c033b6ad39956584447"
-
-[[constraint]]
-  name = "github.com/peterh/liner"
-  revision = "88609521dc4b6c858fd4c98b628147da928ce4ac"
-
-[[override]]
-  name = "github.com/philhofer/fwd"
-  revision = "1612a298117663d7bc9a760ae20d383413859798"
-
-[[constraint]]
-  name = "github.com/prometheus/client_golang"
-  revision = "661e31bf844dfca9aeba15f27ea8aa0d485ad212"
-
-[[override]]
-  name = "github.com/prometheus/client_model"
-  revision = "99fa1f4be8e564e8a6b613da7fa6f46c9edafc6c"
-
-[[override]]
-  name = "github.com/prometheus/common"
-  revision = "2e54d0b93cba2fd133edc32211dcc32c06ef72ca"
-
-[[override]]
-  name = "github.com/prometheus/procfs"
-  revision = "a6e9df898b1336106c743392c48ee0b71f5c4efa"
+  version = "0.2.0"
 
 [[constraint]]
   name = "github.com/retailnext/hllpp"
-  revision = "38a7bb71b483e855d35010808143beaf05b67f9d"
+  branch = "master"
 
 [[constraint]]
   name = "github.com/tinylib/msgp"
-  revision = "ad0ff2e232ad2e37faf67087fb24bf8d04a8ce20"
-
-[[constraint]]
-  name = "github.com/xlab/treeprint"
-  revision = "06dfc6fa17cdde904617990a0c2d89e3e332dbb3"
-
-[[override]]
-  name = "go.uber.org/atomic"
-  revision = "54f72d32435d760d5604f17a82e2435b28dc4ba5"
-
-[[override]]
-  name = "go.uber.org/multierr"
-  revision = "fb7d312c2c04c34f0ad621048bbb953b168f9ff6"
+  version = "1.0.2"
 
 [[constraint]]
   name = "go.uber.org/zap"
-  revision = "35aad584952c3e7020db7b839f6b102de6271f89"
+  version = "1.7.1"
 
 [[constraint]]
-  name = "golang.org/x/crypto"
-  revision = "9477e0b78b9ac3d0b03822fd95422e2fe07627cd"
-
-[[override]]
-  name = "golang.org/x/net"
-  revision = "9dfe39835686865bff950a07b394c12a98ddc811"
-
-[[constraint]]
-  name = "golang.org/x/sync"
-  revision = "fd80eb99c8f653c847d294a001bdf2a3a6f768f5"
-
-[[constraint]]
-  name = "golang.org/x/sys"
-  revision = "062cd7e4e68206d8bab9b18396626e855c992658"
-
-[[constraint]]
-  name = "golang.org/x/text"
-  revision = "a71fd10341b064c10f4a81ceac72bcf70f26ea34"
-
-[[constraint]]
-  name = "golang.org/x/time"
-  revision = "6dc17368e09b0e8634d71cac8168d853e869a0c7"
+  name = "github.com/jsternberg/zap-logfmt"
+  version = "1.0.0"
 
 [prune]
   go-tests = true
diff --git a/write-gdm-deps.sh b/write-gdm-deps.sh
new file mode 100755
index 0000000000..e06d19a21b
--- /dev/null
+++ b/write-gdm-deps.sh
@@ -0,0 +1,2 @@
+#!/bin/bash
+dep status -f $'{{.ProjectRoot}} {{.Revision}}\n'