diff --git a/Gopkg.lock b/Gopkg.lock
index 46d329f28d..6176499b08 100644
--- a/Gopkg.lock
+++ b/Gopkg.lock
@@ -1,18 +1,6 @@
 # This file is autogenerated, do not edit; changes may be undone by the next 'dep ensure'.
 
 
-[[projects]]
-  branch = "master"
-  name = "github.com/alecthomas/gometalinter"
-  packages = ["."]
-  revision = "39a4757a714702004d3fdca45ff83af4dc484af9"
-
-[[projects]]
-  branch = "master"
-  name = "github.com/alecthomas/units"
-  packages = ["."]
-  revision = "2efee857e7cfd4f3d0138cc3cbb1b4966962b93a"
-
 [[projects]]
   name = "github.com/bgentry/speakeasy"
   packages = ["."]
@@ -96,12 +84,6 @@
   packages = ["."]
   revision = "553a641470496b2327abcac10b36396bd98e45c9"
 
-[[projects]]
-  branch = "master"
-  name = "github.com/google/shlex"
-  packages = ["."]
-  revision = "6f45313302b9c56850fc17f99e40caebce98c716"
-
 [[projects]]
   name = "github.com/gorilla/websocket"
   packages = ["."]
@@ -166,17 +148,6 @@
   packages = ["."]
   revision = "00c29f56e2386353d58c599509e8dc3801b0d716"
 
-[[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 = ["."]
@@ -269,16 +240,16 @@
   revision = "c7a14d4b00e222eab6111b4cd1af829c13f53ec2"
 
 [[projects]]
-  branch = "master"
+  branch = "develop"
   name = "github.com/tendermint/abci"
   packages = [
     "client",
     "example/code",
-    "example/dummy",
+    "example/kvstore",
     "server",
     "types"
   ]
-  revision = "c015e7a23dfb7f6004d3e4ff03a49fd5cf1f18f3"
+  revision = "d5361de3001184de7cd3a0ccbae12eccde3d724e"
 
 [[projects]]
   branch = "master"
@@ -303,13 +274,13 @@
   version = "v0.5.0"
 
 [[projects]]
+  branch = "master"
   name = "github.com/tendermint/go-wire"
   packages = [
     ".",
     "data"
   ]
-  revision = "fa721242b042ecd4c6ed1a934ee740db4f74e45c"
-  version = "v0.7.3"
+  revision = "3bd40838076a5c18fe2092b9de022787698b24a3"
 
 [[projects]]
   name = "github.com/tendermint/iavl"
@@ -318,6 +289,7 @@
   version = "v0.6.1"
 
 [[projects]]
+  branch = "develop"
   name = "github.com/tendermint/tendermint"
   packages = [
     "blockchain",
@@ -352,12 +324,14 @@
     "state/txindex/kv",
     "state/txindex/null",
     "types",
-    "version"
+    "types/priv_validator",
+    "version",
+    "wire"
   ]
-  revision = "c8a2bdf78ba7aaaf4284fa78c1b9b05c5e7342bc"
-  version = "v0.16.0"
+  revision = "6120a4c5e4f4b0ea9d5f22cedee949b862b11a5e"
 
 [[projects]]
+  branch = "develop"
   name = "github.com/tendermint/tmlibs"
   packages = [
     "autofile",
@@ -372,8 +346,7 @@
     "pubsub",
     "pubsub/query"
   ]
-  revision = "1b9b5652a199ab0be2e781393fb275b66377309d"
-  version = "v0.7.0"
+  revision = "26f2ab65f82cfc6873c312e8030104c47c05f10e"
 
 [[projects]]
   branch = "master"
@@ -401,6 +374,7 @@
     "idna",
     "internal/timeseries",
     "lex/httplex",
+    "netutil",
     "trace"
   ]
   revision = "22ae77b79946ea320088417e4d50825671d82d57"
@@ -468,12 +442,6 @@
   revision = "8e4536a86ab602859c20df5ebfd0bd4228d08655"
   version = "v1.10.0"
 
-[[projects]]
-  branch = "v3-unstable"
-  name = "gopkg.in/alecthomas/kingpin.v3-unstable"
-  packages = ["."]
-  revision = "b8d601de6db1f3b56a99ffe9051eb708574bc1cd"
-
 [[projects]]
   name = "gopkg.in/yaml.v2"
   packages = ["."]
@@ -483,6 +451,6 @@
 [solve-meta]
   analyzer-name = "dep"
   analyzer-version = 1
-  inputs-digest = "3543b28082202588ae2dba3be755aeb6330015ae2632cc3748ccc6e631eaa4cf"
+  inputs-digest = "75e68c7011e72105ad6c3899566307c831432a0dc32c6b21e650946c65a40c08"
   solver-name = "gps-cdcl"
   solver-version = 1
diff --git a/Gopkg.toml b/Gopkg.toml
index e9a936d57f..abb5df54d9 100644
--- a/Gopkg.toml
+++ b/Gopkg.toml
@@ -41,9 +41,9 @@
   name = "github.com/pkg/errors"
   version = "0.8.0"
 
-[[constraint]]
-  branch = "master"
-  name = "github.com/rigelrozanski/common"
+# [[constraint]]
+#   branch = "master"
+#   name = "github.com/rigelrozanski/common"
 
 [[constraint]]
   name = "github.com/spf13/cobra"
@@ -65,7 +65,7 @@
   branch = "master"
   name = "github.com/tendermint/go-crypto"
 
-[[constraint]]
+[[override]]
   branch = "master"
   name = "github.com/tendermint/go-wire"
 
@@ -73,11 +73,11 @@
   branch = "master"
   name = "github.com/tendermint/iavl"
 
-[[override]]
+[[constraint]]
   branch = "develop"
   name = "github.com/tendermint/tendermint"
 
-[[constraint]]
+[[override]]
   branch = "develop"
   name = "github.com/tendermint/tmlibs"