diff --git a/Godeps/Godeps.json b/Godeps/Godeps.json
index 2ec0e90df4ff4d5df937f237ca4b3f5aa83b749f..bc3b36227626ca79b76423fb31c76c39d4dcf223 100644
--- a/Godeps/Godeps.json
+++ b/Godeps/Godeps.json
@@ -1,6 +1,6 @@
 {
 	"ImportPath": "github.com/eris-ltd/eris-db",
-	"GoVersion": "go1.4.2",
+	"GoVersion": "go1.5.1",
 	"Packages": [
 		"./..."
 	],
@@ -24,10 +24,6 @@
 			"Comment": "v1.0rc1-104-g1a7ab6e",
 			"Rev": "1a7ab6e4d5fdc72d6df30ef562102ae6e0d18518"
 		},
-		{
-			"ImportPath": "github.com/google/go-snappy/snappy",
-			"Rev": "eaa750b9bf4dcb7cb20454be850613b66cda3273"
-		},
 		{
 			"ImportPath": "github.com/gorilla/websocket",
 			"Rev": "a3ec486e6a7a41858210b0fc5d7b5df593b3c4a3"
@@ -81,6 +77,10 @@
 			"ImportPath": "github.com/syndtr/goleveldb/leveldb",
 			"Rev": "a06509502ca32565bdf74afc1e573050023f261c"
 		},
+		{
+			"ImportPath": "github.com/syndtr/gosnappy/snappy",
+			"Rev": "ce8acff4829e0c2458a67ead32390ac0a381c862"
+		},
 		{
 			"ImportPath": "github.com/tendermint/ed25519",
 			"Rev": "533fb6548e2071076888eda3c38749d707ba49bc"
diff --git a/Godeps/_workspace/src/github.com/gin-gonic/gin/auth_test.go b/Godeps/_workspace/src/github.com/gin-gonic/gin/auth_test.go
index b22d9ced6a77a400755c687a7e87cdaf2b9d4d5d..8fc2f233d7a7dd71a0d08c21ffd115645df8e061 100644
--- a/Godeps/_workspace/src/github.com/gin-gonic/gin/auth_test.go
+++ b/Godeps/_workspace/src/github.com/gin-gonic/gin/auth_test.go
@@ -10,7 +10,7 @@ import (
 	"net/http/httptest"
 	"testing"
 
-	"github.com/stretchr/testify/assert"
+	"github.com/eris-ltd/eris-db/Godeps/_workspace/src/github.com/stretchr/testify/assert"
 )
 
 func TestBasicAuth(t *testing.T) {
diff --git a/Godeps/_workspace/src/github.com/gin-gonic/gin/binding/binding_test.go b/Godeps/_workspace/src/github.com/gin-gonic/gin/binding/binding_test.go
index db1678e425527c726f1be3aba0d379f059aec9f7..8c25afd980a9f9ac36e0b9e65d9a4cf8285d5c5b 100644
--- a/Godeps/_workspace/src/github.com/gin-gonic/gin/binding/binding_test.go
+++ b/Godeps/_workspace/src/github.com/gin-gonic/gin/binding/binding_test.go
@@ -9,7 +9,7 @@ import (
 	"net/http"
 	"testing"
 
-	"github.com/stretchr/testify/assert"
+	"github.com/eris-ltd/eris-db/Godeps/_workspace/src/github.com/stretchr/testify/assert"
 )
 
 type FooStruct struct {
diff --git a/Godeps/_workspace/src/github.com/gin-gonic/gin/binding/validate_test.go b/Godeps/_workspace/src/github.com/gin-gonic/gin/binding/validate_test.go
index 27ba7b6671d5fc9ebd7dc8fe80a5c58b4c5adb62..8ab0bc5246ace0820bcacb3b6a5d5763124b38c6 100644
--- a/Godeps/_workspace/src/github.com/gin-gonic/gin/binding/validate_test.go
+++ b/Godeps/_workspace/src/github.com/gin-gonic/gin/binding/validate_test.go
@@ -7,7 +7,7 @@ package binding
 import (
 	"testing"
 
-	"github.com/stretchr/testify/assert"
+	"github.com/eris-ltd/eris-db/Godeps/_workspace/src/github.com/stretchr/testify/assert"
 )
 
 type struct1 struct {
diff --git a/Godeps/_workspace/src/github.com/gin-gonic/gin/context.go b/Godeps/_workspace/src/github.com/gin-gonic/gin/context.go
index 97194525f8e6af3e2f43f4f056b375a5cf1d15c3..0455c0db4ba18653acb86e97144098bb1c27266c 100644
--- a/Godeps/_workspace/src/github.com/gin-gonic/gin/context.go
+++ b/Godeps/_workspace/src/github.com/gin-gonic/gin/context.go
@@ -12,10 +12,10 @@ import (
 	"strings"
 	"time"
 
-	"github.com/gin-gonic/gin/binding"
-	"github.com/gin-gonic/gin/render"
-	"github.commanucorporat/sse"
+	"github.com/eris-ltd/eris-db/Godeps/_workspace/src/github.com/gin-gonic/gin/binding"
+	"github.com/eris-ltd/eris-db/Godeps/_workspace/src/github.com/gin-gonic/gin/render"
 	"github.com/eris-ltd/eris-db/Godeps/_workspace/src/golang.org/x/net/context"
+	"github.com/manucorporat/sse"
 )
 
 const (
diff --git a/Godeps/_workspace/src/github.com/gin-gonic/gin/context_test.go b/Godeps/_workspace/src/github.com/gin-gonic/gin/context_test.go
index 6560d4f1af407f988bbe4fa4107f16d06660392b..e31411e84c7e4fce0f800dcd50145c00f73ea40b 100644
--- a/Godeps/_workspace/src/github.com/gin-gonic/gin/context_test.go
+++ b/Godeps/_workspace/src/github.com/gin-gonic/gin/context_test.go
@@ -14,8 +14,8 @@ import (
 	"testing"
 	"time"
 
-	"github.commanucorporat/sse"
-	"github.com/stretchr/testify/assert"
+	"github.com/eris-ltd/eris-db/Godeps/_workspace/src/github.com/stretchr/testify/assert"
+	"github.com/manucorporat/sse"
 )
 
 // Unit tests TODO
diff --git a/Godeps/_workspace/src/github.com/gin-gonic/gin/debug_test.go b/Godeps/_workspace/src/github.com/gin-gonic/gin/debug_test.go
index 425aff0fe7f64b855455fda54fde40bfecd0f2bc..ea5896167769f444debeba3e88e60675f641c5a6 100644
--- a/Godeps/_workspace/src/github.com/gin-gonic/gin/debug_test.go
+++ b/Godeps/_workspace/src/github.com/gin-gonic/gin/debug_test.go
@@ -12,7 +12,7 @@ import (
 	"os"
 	"testing"
 
-	"github.com/stretchr/testify/assert"
+	"github.com/eris-ltd/eris-db/Godeps/_workspace/src/github.com/stretchr/testify/assert"
 )
 
 // TODO
diff --git a/Godeps/_workspace/src/github.com/gin-gonic/gin/errors_test.go b/Godeps/_workspace/src/github.com/gin-gonic/gin/errors_test.go
index 748e3fe059f116de02e8d0b394b2bbe314fc5292..aa7cc3ddc05bbc39c8ea1bf13c4d56e2ef11a39c 100644
--- a/Godeps/_workspace/src/github.com/gin-gonic/gin/errors_test.go
+++ b/Godeps/_workspace/src/github.com/gin-gonic/gin/errors_test.go
@@ -9,7 +9,7 @@ import (
 	"errors"
 	"testing"
 
-	"github.com/stretchr/testify/assert"
+	"github.com/eris-ltd/eris-db/Godeps/_workspace/src/github.com/stretchr/testify/assert"
 )
 
 func TestError(t *testing.T) {
diff --git a/Godeps/_workspace/src/github.com/gin-gonic/gin/examples/app-engine/hello.go b/Godeps/_workspace/src/github.com/gin-gonic/gin/examples/app-engine/hello.go
index a5e1796237e607f0a5825c05a8e909b528e3d8a2..2b09841028313a030a5c24a97c57f03635043209 100644
--- a/Godeps/_workspace/src/github.com/gin-gonic/gin/examples/app-engine/hello.go
+++ b/Godeps/_workspace/src/github.com/gin-gonic/gin/examples/app-engine/hello.go
@@ -1,7 +1,7 @@
 package hello
 
 import (
-	"github.com/gin-gonic/gin"
+	"github.com/eris-ltd/eris-db/Godeps/_workspace/src/github.com/gin-gonic/gin"
 	"net/http"
 )
 
diff --git a/Godeps/_workspace/src/github.com/gin-gonic/gin/examples/basic/main.go b/Godeps/_workspace/src/github.com/gin-gonic/gin/examples/basic/main.go
index 80f2bd3c7f3ff8773433af41441e23c611589784..b0f1ece7c982d576e76f754f8d8a66390d941c68 100644
--- a/Godeps/_workspace/src/github.com/gin-gonic/gin/examples/basic/main.go
+++ b/Godeps/_workspace/src/github.com/gin-gonic/gin/examples/basic/main.go
@@ -1,7 +1,7 @@
 package main
 
 import (
-	"github.com/gin-gonic/gin"
+	"github.com/eris-ltd/eris-db/Godeps/_workspace/src/github.com/gin-gonic/gin"
 )
 
 var DB = make(map[string]string)
diff --git a/Godeps/_workspace/src/github.com/gin-gonic/gin/examples/realtime-advanced/main.go b/Godeps/_workspace/src/github.com/gin-gonic/gin/examples/realtime-advanced/main.go
index 1f3c8585ff9032a8f326f365bd0528b83f60dfa4..538cea7456dc31e663483a32d11a54c27926863c 100644
--- a/Godeps/_workspace/src/github.com/gin-gonic/gin/examples/realtime-advanced/main.go
+++ b/Godeps/_workspace/src/github.com/gin-gonic/gin/examples/realtime-advanced/main.go
@@ -4,7 +4,7 @@ import (
 	"fmt"
 	"runtime"
 
-	"github.com/gin-gonic/gin"
+	"github.com/eris-ltd/eris-db/Godeps/_workspace/src/github.com/gin-gonic/gin"
 )
 
 func main() {
diff --git a/Godeps/_workspace/src/github.com/gin-gonic/gin/examples/realtime-advanced/routes.go b/Godeps/_workspace/src/github.com/gin-gonic/gin/examples/realtime-advanced/routes.go
index b187756580b8c699a5695e29fc90653c3dcba31a..cc7c008794caa87208dac752f38f5d9bed2ce1d5 100644
--- a/Godeps/_workspace/src/github.com/gin-gonic/gin/examples/realtime-advanced/routes.go
+++ b/Godeps/_workspace/src/github.com/gin-gonic/gin/examples/realtime-advanced/routes.go
@@ -7,7 +7,7 @@ import (
 	"strings"
 	"time"
 
-	"github.com/gin-gonic/gin"
+	"github.com/eris-ltd/eris-db/Godeps/_workspace/src/github.com/gin-gonic/gin"
 )
 
 func rateLimit(c *gin.Context) {
diff --git a/Godeps/_workspace/src/github.com/gin-gonic/gin/examples/realtime-chat/main.go b/Godeps/_workspace/src/github.com/gin-gonic/gin/examples/realtime-chat/main.go
index e4b55a0f094380343cbac19cf68f1bdf066a3409..8f7f473fd3bb6454b3e1bb5e8f3b1aea3ef48455 100644
--- a/Godeps/_workspace/src/github.com/gin-gonic/gin/examples/realtime-chat/main.go
+++ b/Godeps/_workspace/src/github.com/gin-gonic/gin/examples/realtime-chat/main.go
@@ -5,7 +5,7 @@ import (
 	"io"
 	"math/rand"
 
-	"github.com/gin-gonic/gin"
+	"github.com/eris-ltd/eris-db/Godeps/_workspace/src/github.com/gin-gonic/gin"
 )
 
 func main() {
diff --git a/Godeps/_workspace/src/github.com/gin-gonic/gin/gin.go b/Godeps/_workspace/src/github.com/gin-gonic/gin/gin.go
index e18d5b6da3f349a343314ac7345a9ae326cb3f69..05369c61ff77f7fbccadf5036bf30dad69de5be8 100644
--- a/Godeps/_workspace/src/github.com/gin-gonic/gin/gin.go
+++ b/Godeps/_workspace/src/github.com/gin-gonic/gin/gin.go
@@ -11,7 +11,7 @@ import (
 	"os"
 	"sync"
 
-	"github.com/gin-gonic/gin/render"
+	"github.com/eris-ltd/eris-db/Godeps/_workspace/src/github.com/gin-gonic/gin/render"
 )
 
 const Version = "v1.0rc2"
diff --git a/Godeps/_workspace/src/github.com/gin-gonic/gin/gin_integration_test.go b/Godeps/_workspace/src/github.com/gin-gonic/gin/gin_integration_test.go
index f7ae0758e08892803d3eee5353b01266e3939cdc..fe2fe754249a0cf4762696477f67ca7b8467582a 100644
--- a/Godeps/_workspace/src/github.com/gin-gonic/gin/gin_integration_test.go
+++ b/Godeps/_workspace/src/github.com/gin-gonic/gin/gin_integration_test.go
@@ -10,7 +10,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/stretchr/testify/assert"
+	"github.com/eris-ltd/eris-db/Godeps/_workspace/src/github.com/stretchr/testify/assert"
 )
 
 func TestRun(t *testing.T) {
diff --git a/Godeps/_workspace/src/github.com/gin-gonic/gin/gin_test.go b/Godeps/_workspace/src/github.com/gin-gonic/gin/gin_test.go
index fc9e821233d5de654c3b8fdf9b2d08161f7a7211..96cbf572c31260b1880cf28b1daab1ef9991ddeb 100644
--- a/Godeps/_workspace/src/github.com/gin-gonic/gin/gin_test.go
+++ b/Godeps/_workspace/src/github.com/gin-gonic/gin/gin_test.go
@@ -8,7 +8,7 @@ import (
 	"reflect"
 	"testing"
 
-	"github.com/stretchr/testify/assert"
+	"github.com/eris-ltd/eris-db/Godeps/_workspace/src/github.com/stretchr/testify/assert"
 )
 
 //TODO
diff --git a/Godeps/_workspace/src/github.com/gin-gonic/gin/githubapi_test.go b/Godeps/_workspace/src/github.com/gin-gonic/gin/githubapi_test.go
index 2227fa6ae8fcf61d919a02873f095bc58048d168..fe2328246665397d8cbb28ec0547c708a78e3919 100644
--- a/Godeps/_workspace/src/github.com/gin-gonic/gin/githubapi_test.go
+++ b/Godeps/_workspace/src/github.com/gin-gonic/gin/githubapi_test.go
@@ -12,7 +12,7 @@ import (
 	"net/http/httptest"
 	"testing"
 
-	"github.com/stretchr/testify/assert"
+	"github.com/eris-ltd/eris-db/Godeps/_workspace/src/github.com/stretchr/testify/assert"
 )
 
 type route struct {
diff --git a/Godeps/_workspace/src/github.com/gin-gonic/gin/logger_test.go b/Godeps/_workspace/src/github.com/gin-gonic/gin/logger_test.go
index 1cdaa94cb5d31f220c6e08cd694256a88980e509..1d4755ec79903e774e1d0b452af8659174ef02be 100644
--- a/Godeps/_workspace/src/github.com/gin-gonic/gin/logger_test.go
+++ b/Godeps/_workspace/src/github.com/gin-gonic/gin/logger_test.go
@@ -8,7 +8,7 @@ import (
 	"bytes"
 	"testing"
 
-	"github.com/stretchr/testify/assert"
+	"github.com/eris-ltd/eris-db/Godeps/_workspace/src/github.com/stretchr/testify/assert"
 )
 
 //TODO
diff --git a/Godeps/_workspace/src/github.com/gin-gonic/gin/middleware_test.go b/Godeps/_workspace/src/github.com/gin-gonic/gin/middleware_test.go
index dea679fff50308656364e7e29d38e968f2038004..61535de2101687579494bc04eb0cb0687a802611 100644
--- a/Godeps/_workspace/src/github.com/gin-gonic/gin/middleware_test.go
+++ b/Godeps/_workspace/src/github.com/gin-gonic/gin/middleware_test.go
@@ -9,8 +9,8 @@ import (
 
 	"testing"
 
-	"github.commanucorporat/sse"
-	"github.com/stretchr/testify/assert"
+	"github.com/eris-ltd/eris-db/Godeps/_workspace/src/github.com/stretchr/testify/assert"
+	"github.com/manucorporat/sse"
 )
 
 func TestMiddlewareGeneralCase(t *testing.T) {
diff --git a/Godeps/_workspace/src/github.com/gin-gonic/gin/mode.go b/Godeps/_workspace/src/github.com/gin-gonic/gin/mode.go
index eef66b8aba9f17046bc0dbe5c1f8665363e896e1..f563ae8192bd8400f4f031cd668a7f0649d281d1 100644
--- a/Godeps/_workspace/src/github.com/gin-gonic/gin/mode.go
+++ b/Godeps/_workspace/src/github.com/gin-gonic/gin/mode.go
@@ -8,8 +8,8 @@ import (
 	"io"
 	"os"
 
-	"github.com/gin-gonic/gin/binding"
-	"github.commattn/go-colorable"
+	"github.com/eris-ltd/eris-db/Godeps/_workspace/src/github.com/gin-gonic/gin/binding"
+	"github.com/mattn/go-colorable"
 )
 
 const ENV_GIN_MODE = "GIN_MODE"
diff --git a/Godeps/_workspace/src/github.com/gin-gonic/gin/mode_test.go b/Godeps/_workspace/src/github.com/gin-gonic/gin/mode_test.go
index 2a23d85e94f5171e4ee9c5d91f374e705ff4b421..8fd7a43b898cfef11a209e6243422396179b1ef1 100644
--- a/Godeps/_workspace/src/github.com/gin-gonic/gin/mode_test.go
+++ b/Godeps/_workspace/src/github.com/gin-gonic/gin/mode_test.go
@@ -7,7 +7,7 @@ package gin
 import (
 	"testing"
 
-	"github.com/stretchr/testify/assert"
+	"github.com/eris-ltd/eris-db/Godeps/_workspace/src/github.com/stretchr/testify/assert"
 )
 
 func init() {
diff --git a/Godeps/_workspace/src/github.com/gin-gonic/gin/path_test.go b/Godeps/_workspace/src/github.com/gin-gonic/gin/path_test.go
index 01cb758a4f517a2523f7d06718a8ce7a809944f8..16eb439bdd50fb674223d60479f1e83a4603a5ab 100644
--- a/Godeps/_workspace/src/github.com/gin-gonic/gin/path_test.go
+++ b/Godeps/_workspace/src/github.com/gin-gonic/gin/path_test.go
@@ -9,7 +9,7 @@ import (
 	"runtime"
 	"testing"
 
-	"github.com/stretchr/testify/assert"
+	"github.com/eris-ltd/eris-db/Godeps/_workspace/src/github.com/stretchr/testify/assert"
 )
 
 var cleanTests = []struct {
diff --git a/Godeps/_workspace/src/github.com/gin-gonic/gin/recovery_test.go b/Godeps/_workspace/src/github.com/gin-gonic/gin/recovery_test.go
index 39e71e816023b0efee4a8e766f957d526e77203a..aae0ef2c0097207d09e7f74ed1533bb7db8f1b9d 100644
--- a/Godeps/_workspace/src/github.com/gin-gonic/gin/recovery_test.go
+++ b/Godeps/_workspace/src/github.com/gin-gonic/gin/recovery_test.go
@@ -8,7 +8,7 @@ import (
 	"bytes"
 	"testing"
 
-	"github.com/stretchr/testify/assert"
+	"github.com/eris-ltd/eris-db/Godeps/_workspace/src/github.com/stretchr/testify/assert"
 )
 
 // TestPanicInHandler assert that panic has been recovered.
diff --git a/Godeps/_workspace/src/github.com/gin-gonic/gin/render/render_test.go b/Godeps/_workspace/src/github.com/gin-gonic/gin/render/render_test.go
index 7a6ffb7d5cf28d353cf6b98e9b09d6f552a45236..8be5220ca911c79cf95020d891d729301653b2ed 100644
--- a/Godeps/_workspace/src/github.com/gin-gonic/gin/render/render_test.go
+++ b/Godeps/_workspace/src/github.com/gin-gonic/gin/render/render_test.go
@@ -10,7 +10,7 @@ import (
 	"net/http/httptest"
 	"testing"
 
-	"github.com/stretchr/testify/assert"
+	"github.com/eris-ltd/eris-db/Godeps/_workspace/src/github.com/stretchr/testify/assert"
 )
 
 // TODO unit tests
diff --git a/Godeps/_workspace/src/github.com/gin-gonic/gin/response_writer_test.go b/Godeps/_workspace/src/github.com/gin-gonic/gin/response_writer_test.go
index 7306d192573c53891b53bde3c6fd1f17cdd5662b..ec7133a80d58d24b2cb6176fe610315bf3c139d3 100644
--- a/Godeps/_workspace/src/github.com/gin-gonic/gin/response_writer_test.go
+++ b/Godeps/_workspace/src/github.com/gin-gonic/gin/response_writer_test.go
@@ -9,7 +9,7 @@ import (
 	"net/http/httptest"
 	"testing"
 
-	"github.com/stretchr/testify/assert"
+	"github.com/eris-ltd/eris-db/Godeps/_workspace/src/github.com/stretchr/testify/assert"
 )
 
 // TODO
diff --git a/Godeps/_workspace/src/github.com/gin-gonic/gin/routergroup_test.go b/Godeps/_workspace/src/github.com/gin-gonic/gin/routergroup_test.go
index 14c7421bd350aa4c56292af88b41024acb33db35..67f7f8e60e9d8ff8425ace26d93d49f60bc3eb81 100644
--- a/Godeps/_workspace/src/github.com/gin-gonic/gin/routergroup_test.go
+++ b/Godeps/_workspace/src/github.com/gin-gonic/gin/routergroup_test.go
@@ -7,7 +7,7 @@ package gin
 import (
 	"testing"
 
-	"github.com/stretchr/testify/assert"
+	"github.com/eris-ltd/eris-db/Godeps/_workspace/src/github.com/stretchr/testify/assert"
 )
 
 func init() {
diff --git a/Godeps/_workspace/src/github.com/gin-gonic/gin/routes_test.go b/Godeps/_workspace/src/github.com/gin-gonic/gin/routes_test.go
index 2f451f84eb0bc4ad96eb9029bc1585d95a81c0f6..3f5d23ed4a05dfd05d7c5fd1d76f4490276b9611 100644
--- a/Godeps/_workspace/src/github.com/gin-gonic/gin/routes_test.go
+++ b/Godeps/_workspace/src/github.com/gin-gonic/gin/routes_test.go
@@ -13,7 +13,7 @@ import (
 	"path/filepath"
 	"testing"
 
-	"github.com/stretchr/testify/assert"
+	"github.com/eris-ltd/eris-db/Godeps/_workspace/src/github.com/stretchr/testify/assert"
 )
 
 func performRequest(r http.Handler, method, path string) *httptest.ResponseRecorder {
diff --git a/Godeps/_workspace/src/github.com/gin-gonic/gin/utils_test.go b/Godeps/_workspace/src/github.com/gin-gonic/gin/utils_test.go
index ba0cc20d9db5a9f3a641b2e48282e8a03f5f407d..e2fcf4f4ad3f821708706f54c0c0bd8a976a01d3 100644
--- a/Godeps/_workspace/src/github.com/gin-gonic/gin/utils_test.go
+++ b/Godeps/_workspace/src/github.com/gin-gonic/gin/utils_test.go
@@ -9,7 +9,7 @@ import (
 	"net/http"
 	"testing"
 
-	"github.com/stretchr/testify/assert"
+	"github.com/eris-ltd/eris-db/Godeps/_workspace/src/github.com/stretchr/testify/assert"
 )
 
 func init() {
diff --git a/Godeps/_workspace/src/github.com/google/go-snappy/snappy/decode.go b/Godeps/_workspace/src/github.com/google/go-snappy/snappy/decode.go
deleted file mode 100644
index 552a17bfb0500fe0617753c9ca7df0263ec363db..0000000000000000000000000000000000000000
--- a/Godeps/_workspace/src/github.com/google/go-snappy/snappy/decode.go
+++ /dev/null
@@ -1,292 +0,0 @@
-// Copyright 2011 The Snappy-Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package snappy
-
-import (
-	"encoding/binary"
-	"errors"
-	"io"
-)
-
-var (
-	// ErrCorrupt reports that the input is invalid.
-	ErrCorrupt = errors.New("snappy: corrupt input")
-	// ErrUnsupported reports that the input isn't supported.
-	ErrUnsupported = errors.New("snappy: unsupported input")
-)
-
-// DecodedLen returns the length of the decoded block.
-func DecodedLen(src []byte) (int, error) {
-	v, _, err := decodedLen(src)
-	return v, err
-}
-
-// decodedLen returns the length of the decoded block and the number of bytes
-// that the length header occupied.
-func decodedLen(src []byte) (blockLen, headerLen int, err error) {
-	v, n := binary.Uvarint(src)
-	if n == 0 {
-		return 0, 0, ErrCorrupt
-	}
-	if uint64(int(v)) != v {
-		return 0, 0, errors.New("snappy: decoded block is too large")
-	}
-	return int(v), n, nil
-}
-
-// Decode returns the decoded form of src. The returned slice may be a sub-
-// slice of dst if dst was large enough to hold the entire decoded block.
-// Otherwise, a newly allocated slice will be returned.
-// It is valid to pass a nil dst.
-func Decode(dst, src []byte) ([]byte, error) {
-	dLen, s, err := decodedLen(src)
-	if err != nil {
-		return nil, err
-	}
-	if len(dst) < dLen {
-		dst = make([]byte, dLen)
-	}
-
-	var d, offset, length int
-	for s < len(src) {
-		switch src[s] & 0x03 {
-		case tagLiteral:
-			x := uint(src[s] >> 2)
-			switch {
-			case x < 60:
-				s += 1
-			case x == 60:
-				s += 2
-				if s > len(src) {
-					return nil, ErrCorrupt
-				}
-				x = uint(src[s-1])
-			case x == 61:
-				s += 3
-				if s > len(src) {
-					return nil, ErrCorrupt
-				}
-				x = uint(src[s-2]) | uint(src[s-1])<<8
-			case x == 62:
-				s += 4
-				if s > len(src) {
-					return nil, ErrCorrupt
-				}
-				x = uint(src[s-3]) | uint(src[s-2])<<8 | uint(src[s-1])<<16
-			case x == 63:
-				s += 5
-				if s > len(src) {
-					return nil, ErrCorrupt
-				}
-				x = uint(src[s-4]) | uint(src[s-3])<<8 | uint(src[s-2])<<16 | uint(src[s-1])<<24
-			}
-			length = int(x + 1)
-			if length <= 0 {
-				return nil, errors.New("snappy: unsupported literal length")
-			}
-			if length > len(dst)-d || length > len(src)-s {
-				return nil, ErrCorrupt
-			}
-			copy(dst[d:], src[s:s+length])
-			d += length
-			s += length
-			continue
-
-		case tagCopy1:
-			s += 2
-			if s > len(src) {
-				return nil, ErrCorrupt
-			}
-			length = 4 + int(src[s-2])>>2&0x7
-			offset = int(src[s-2])&0xe0<<3 | int(src[s-1])
-
-		case tagCopy2:
-			s += 3
-			if s > len(src) {
-				return nil, ErrCorrupt
-			}
-			length = 1 + int(src[s-3])>>2
-			offset = int(src[s-2]) | int(src[s-1])<<8
-
-		case tagCopy4:
-			return nil, errors.New("snappy: unsupported COPY_4 tag")
-		}
-
-		end := d + length
-		if offset > d || end > len(dst) {
-			return nil, ErrCorrupt
-		}
-		for ; d < end; d++ {
-			dst[d] = dst[d-offset]
-		}
-	}
-	if d != dLen {
-		return nil, ErrCorrupt
-	}
-	return dst[:d], nil
-}
-
-// NewReader returns a new Reader that decompresses from r, using the framing
-// format described at
-// https://code.google.com/p/snappy/source/browse/trunk/framing_format.txt
-func NewReader(r io.Reader) *Reader {
-	return &Reader{
-		r:       r,
-		decoded: make([]byte, maxUncompressedChunkLen),
-		buf:     make([]byte, MaxEncodedLen(maxUncompressedChunkLen)+checksumSize),
-	}
-}
-
-// Reader is an io.Reader than can read Snappy-compressed bytes.
-type Reader struct {
-	r       io.Reader
-	err     error
-	decoded []byte
-	buf     []byte
-	// decoded[i:j] contains decoded bytes that have not yet been passed on.
-	i, j       int
-	readHeader bool
-}
-
-// Reset discards any buffered data, resets all state, and switches the Snappy
-// reader to read from r. This permits reusing a Reader rather than allocating
-// a new one.
-func (r *Reader) Reset(reader io.Reader) {
-	r.r = reader
-	r.err = nil
-	r.i = 0
-	r.j = 0
-	r.readHeader = false
-}
-
-func (r *Reader) readFull(p []byte) (ok bool) {
-	if _, r.err = io.ReadFull(r.r, p); r.err != nil {
-		if r.err == io.ErrUnexpectedEOF {
-			r.err = ErrCorrupt
-		}
-		return false
-	}
-	return true
-}
-
-// Read satisfies the io.Reader interface.
-func (r *Reader) Read(p []byte) (int, error) {
-	if r.err != nil {
-		return 0, r.err
-	}
-	for {
-		if r.i < r.j {
-			n := copy(p, r.decoded[r.i:r.j])
-			r.i += n
-			return n, nil
-		}
-		if !r.readFull(r.buf[:4]) {
-			return 0, r.err
-		}
-		chunkType := r.buf[0]
-		if !r.readHeader {
-			if chunkType != chunkTypeStreamIdentifier {
-				r.err = ErrCorrupt
-				return 0, r.err
-			}
-			r.readHeader = true
-		}
-		chunkLen := int(r.buf[1]) | int(r.buf[2])<<8 | int(r.buf[3])<<16
-		if chunkLen > len(r.buf) {
-			r.err = ErrUnsupported
-			return 0, r.err
-		}
-
-		// The chunk types are specified at
-		// https://code.google.com/p/snappy/source/browse/trunk/framing_format.txt
-		switch chunkType {
-		case chunkTypeCompressedData:
-			// Section 4.2. Compressed data (chunk type 0x00).
-			if chunkLen < checksumSize {
-				r.err = ErrCorrupt
-				return 0, r.err
-			}
-			buf := r.buf[:chunkLen]
-			if !r.readFull(buf) {
-				return 0, r.err
-			}
-			checksum := uint32(buf[0]) | uint32(buf[1])<<8 | uint32(buf[2])<<16 | uint32(buf[3])<<24
-			buf = buf[checksumSize:]
-
-			n, err := DecodedLen(buf)
-			if err != nil {
-				r.err = err
-				return 0, r.err
-			}
-			if n > len(r.decoded) {
-				r.err = ErrCorrupt
-				return 0, r.err
-			}
-			if _, err := Decode(r.decoded, buf); err != nil {
-				r.err = err
-				return 0, r.err
-			}
-			if crc(r.decoded[:n]) != checksum {
-				r.err = ErrCorrupt
-				return 0, r.err
-			}
-			r.i, r.j = 0, n
-			continue
-
-		case chunkTypeUncompressedData:
-			// Section 4.3. Uncompressed data (chunk type 0x01).
-			if chunkLen < checksumSize {
-				r.err = ErrCorrupt
-				return 0, r.err
-			}
-			buf := r.buf[:checksumSize]
-			if !r.readFull(buf) {
-				return 0, r.err
-			}
-			checksum := uint32(buf[0]) | uint32(buf[1])<<8 | uint32(buf[2])<<16 | uint32(buf[3])<<24
-			// Read directly into r.decoded instead of via r.buf.
-			n := chunkLen - checksumSize
-			if !r.readFull(r.decoded[:n]) {
-				return 0, r.err
-			}
-			if crc(r.decoded[:n]) != checksum {
-				r.err = ErrCorrupt
-				return 0, r.err
-			}
-			r.i, r.j = 0, n
-			continue
-
-		case chunkTypeStreamIdentifier:
-			// Section 4.1. Stream identifier (chunk type 0xff).
-			if chunkLen != len(magicBody) {
-				r.err = ErrCorrupt
-				return 0, r.err
-			}
-			if !r.readFull(r.buf[:len(magicBody)]) {
-				return 0, r.err
-			}
-			for i := 0; i < len(magicBody); i++ {
-				if r.buf[i] != magicBody[i] {
-					r.err = ErrCorrupt
-					return 0, r.err
-				}
-			}
-			continue
-		}
-
-		if chunkType <= 0x7f {
-			// Section 4.5. Reserved unskippable chunks (chunk types 0x02-0x7f).
-			r.err = ErrUnsupported
-			return 0, r.err
-
-		} else {
-			// Section 4.4 Padding (chunk type 0xfe).
-			// Section 4.6. Reserved skippable chunks (chunk types 0x80-0xfd).
-			if !r.readFull(r.buf[:chunkLen]) {
-				return 0, r.err
-			}
-		}
-	}
-}
diff --git a/Godeps/_workspace/src/github.com/google/go-snappy/snappy/encode.go b/Godeps/_workspace/src/github.com/google/go-snappy/snappy/encode.go
deleted file mode 100644
index dda372422d437441e1932607737295eae4bd30fd..0000000000000000000000000000000000000000
--- a/Godeps/_workspace/src/github.com/google/go-snappy/snappy/encode.go
+++ /dev/null
@@ -1,258 +0,0 @@
-// Copyright 2011 The Snappy-Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package snappy
-
-import (
-	"encoding/binary"
-	"io"
-)
-
-// We limit how far copy back-references can go, the same as the C++ code.
-const maxOffset = 1 << 15
-
-// emitLiteral writes a literal chunk and returns the number of bytes written.
-func emitLiteral(dst, lit []byte) int {
-	i, n := 0, uint(len(lit)-1)
-	switch {
-	case n < 60:
-		dst[0] = uint8(n)<<2 | tagLiteral
-		i = 1
-	case n < 1<<8:
-		dst[0] = 60<<2 | tagLiteral
-		dst[1] = uint8(n)
-		i = 2
-	case n < 1<<16:
-		dst[0] = 61<<2 | tagLiteral
-		dst[1] = uint8(n)
-		dst[2] = uint8(n >> 8)
-		i = 3
-	case n < 1<<24:
-		dst[0] = 62<<2 | tagLiteral
-		dst[1] = uint8(n)
-		dst[2] = uint8(n >> 8)
-		dst[3] = uint8(n >> 16)
-		i = 4
-	case int64(n) < 1<<32:
-		dst[0] = 63<<2 | tagLiteral
-		dst[1] = uint8(n)
-		dst[2] = uint8(n >> 8)
-		dst[3] = uint8(n >> 16)
-		dst[4] = uint8(n >> 24)
-		i = 5
-	default:
-		panic("snappy: source buffer is too long")
-	}
-	if copy(dst[i:], lit) != len(lit) {
-		panic("snappy: destination buffer is too short")
-	}
-	return i + len(lit)
-}
-
-// emitCopy writes a copy chunk and returns the number of bytes written.
-func emitCopy(dst []byte, offset, length int) int {
-	i := 0
-	for length > 0 {
-		x := length - 4
-		if 0 <= x && x < 1<<3 && offset < 1<<11 {
-			dst[i+0] = uint8(offset>>8)&0x07<<5 | uint8(x)<<2 | tagCopy1
-			dst[i+1] = uint8(offset)
-			i += 2
-			break
-		}
-
-		x = length
-		if x > 1<<6 {
-			x = 1 << 6
-		}
-		dst[i+0] = uint8(x-1)<<2 | tagCopy2
-		dst[i+1] = uint8(offset)
-		dst[i+2] = uint8(offset >> 8)
-		i += 3
-		length -= x
-	}
-	return i
-}
-
-// Encode returns the encoded form of src. The returned slice may be a sub-
-// slice of dst if dst was large enough to hold the entire encoded block.
-// Otherwise, a newly allocated slice will be returned.
-// It is valid to pass a nil dst.
-func Encode(dst, src []byte) ([]byte, error) {
-	if n := MaxEncodedLen(len(src)); len(dst) < n {
-		dst = make([]byte, n)
-	}
-
-	// The block starts with the varint-encoded length of the decompressed bytes.
-	d := binary.PutUvarint(dst, uint64(len(src)))
-
-	// Return early if src is short.
-	if len(src) <= 4 {
-		if len(src) != 0 {
-			d += emitLiteral(dst[d:], src)
-		}
-		return dst[:d], nil
-	}
-
-	// Initialize the hash table. Its size ranges from 1<<8 to 1<<14 inclusive.
-	const maxTableSize = 1 << 14
-	shift, tableSize := uint(32-8), 1<<8
-	for tableSize < maxTableSize && tableSize < len(src) {
-		shift--
-		tableSize *= 2
-	}
-	var table [maxTableSize]int
-
-	// Iterate over the source bytes.
-	var (
-		s   int // The iterator position.
-		t   int // The last position with the same hash as s.
-		lit int // The start position of any pending literal bytes.
-	)
-	for s+3 < len(src) {
-		// Update the hash table.
-		b0, b1, b2, b3 := src[s], src[s+1], src[s+2], src[s+3]
-		h := uint32(b0) | uint32(b1)<<8 | uint32(b2)<<16 | uint32(b3)<<24
-		p := &table[(h*0x1e35a7bd)>>shift]
-		// We need to to store values in [-1, inf) in table. To save
-		// some initialization time, (re)use the table's zero value
-		// and shift the values against this zero: add 1 on writes,
-		// subtract 1 on reads.
-		t, *p = *p-1, s+1
-		// If t is invalid or src[s:s+4] differs from src[t:t+4], accumulate a literal byte.
-		if t < 0 || s-t >= maxOffset || b0 != src[t] || b1 != src[t+1] || b2 != src[t+2] || b3 != src[t+3] {
-			s++
-			continue
-		}
-		// Otherwise, we have a match. First, emit any pending literal bytes.
-		if lit != s {
-			d += emitLiteral(dst[d:], src[lit:s])
-		}
-		// Extend the match to be as long as possible.
-		s0 := s
-		s, t = s+4, t+4
-		for s < len(src) && src[s] == src[t] {
-			s++
-			t++
-		}
-		// Emit the copied bytes.
-		d += emitCopy(dst[d:], s-t, s-s0)
-		lit = s
-	}
-
-	// Emit any final pending literal bytes and return.
-	if lit != len(src) {
-		d += emitLiteral(dst[d:], src[lit:])
-	}
-	return dst[:d], nil
-}
-
-// MaxEncodedLen returns the maximum length of a snappy block, given its
-// uncompressed length.
-func MaxEncodedLen(srcLen int) int {
-	// Compressed data can be defined as:
-	//    compressed := item* literal*
-	//    item       := literal* copy
-	//
-	// The trailing literal sequence has a space blowup of at most 62/60
-	// since a literal of length 60 needs one tag byte + one extra byte
-	// for length information.
-	//
-	// Item blowup is trickier to measure. Suppose the "copy" op copies
-	// 4 bytes of data. Because of a special check in the encoding code,
-	// we produce a 4-byte copy only if the offset is < 65536. Therefore
-	// the copy op takes 3 bytes to encode, and this type of item leads
-	// to at most the 62/60 blowup for representing literals.
-	//
-	// Suppose the "copy" op copies 5 bytes of data. If the offset is big
-	// enough, it will take 5 bytes to encode the copy op. Therefore the
-	// worst case here is a one-byte literal followed by a five-byte copy.
-	// That is, 6 bytes of input turn into 7 bytes of "compressed" data.
-	//
-	// This last factor dominates the blowup, so the final estimate is:
-	return 32 + srcLen + srcLen/6
-}
-
-// NewWriter returns a new Writer that compresses to w, using the framing
-// format described at
-// https://code.google.com/p/snappy/source/browse/trunk/framing_format.txt
-func NewWriter(w io.Writer) *Writer {
-	return &Writer{
-		w:   w,
-		enc: make([]byte, MaxEncodedLen(maxUncompressedChunkLen)),
-	}
-}
-
-// Writer is an io.Writer than can write Snappy-compressed bytes.
-type Writer struct {
-	w           io.Writer
-	err         error
-	enc         []byte
-	buf         [checksumSize + chunkHeaderSize]byte
-	wroteHeader bool
-}
-
-// Reset discards the writer's state and switches the Snappy writer to write to
-// w. This permits reusing a Writer rather than allocating a new one.
-func (w *Writer) Reset(writer io.Writer) {
-	w.w = writer
-	w.err = nil
-	w.wroteHeader = false
-}
-
-// Write satisfies the io.Writer interface.
-func (w *Writer) Write(p []byte) (n int, errRet error) {
-	if w.err != nil {
-		return 0, w.err
-	}
-	if !w.wroteHeader {
-		copy(w.enc, magicChunk)
-		if _, err := w.w.Write(w.enc[:len(magicChunk)]); err != nil {
-			w.err = err
-			return n, err
-		}
-		w.wroteHeader = true
-	}
-	for len(p) > 0 {
-		var uncompressed []byte
-		if len(p) > maxUncompressedChunkLen {
-			uncompressed, p = p[:maxUncompressedChunkLen], p[maxUncompressedChunkLen:]
-		} else {
-			uncompressed, p = p, nil
-		}
-		checksum := crc(uncompressed)
-
-		// Compress the buffer, discarding the result if the improvement
-		// isn't at least 12.5%.
-		chunkType := uint8(chunkTypeCompressedData)
-		chunkBody, err := Encode(w.enc, uncompressed)
-		if err != nil {
-			w.err = err
-			return n, err
-		}
-		if len(chunkBody) >= len(uncompressed)-len(uncompressed)/8 {
-			chunkType, chunkBody = chunkTypeUncompressedData, uncompressed
-		}
-
-		chunkLen := 4 + len(chunkBody)
-		w.buf[0] = chunkType
-		w.buf[1] = uint8(chunkLen >> 0)
-		w.buf[2] = uint8(chunkLen >> 8)
-		w.buf[3] = uint8(chunkLen >> 16)
-		w.buf[4] = uint8(checksum >> 0)
-		w.buf[5] = uint8(checksum >> 8)
-		w.buf[6] = uint8(checksum >> 16)
-		w.buf[7] = uint8(checksum >> 24)
-		if _, err = w.w.Write(w.buf[:]); err != nil {
-			w.err = err
-			return n, err
-		}
-		if _, err = w.w.Write(chunkBody); err != nil {
-			w.err = err
-			return n, err
-		}
-		n += len(uncompressed)
-	}
-	return n, nil
-}
diff --git a/Godeps/_workspace/src/github.com/google/go-snappy/snappy/snappy.go b/Godeps/_workspace/src/github.com/google/go-snappy/snappy/snappy.go
deleted file mode 100644
index 043bf3d81a949af84bafdf12a7b1e06f93e75bb9..0000000000000000000000000000000000000000
--- a/Godeps/_workspace/src/github.com/google/go-snappy/snappy/snappy.go
+++ /dev/null
@@ -1,68 +0,0 @@
-// Copyright 2011 The Snappy-Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// Package snappy implements the snappy block-based compression format.
-// It aims for very high speeds and reasonable compression.
-//
-// The C++ snappy implementation is at http://code.google.com/p/snappy/
-package snappy
-
-import (
-	"hash/crc32"
-)
-
-/*
-Each encoded block begins with the varint-encoded length of the decoded data,
-followed by a sequence of chunks. Chunks begin and end on byte boundaries. The
-first byte of each chunk is broken into its 2 least and 6 most significant bits
-called l and m: l ranges in [0, 4) and m ranges in [0, 64). l is the chunk tag.
-Zero means a literal tag. All other values mean a copy tag.
-
-For literal tags:
-  - If m < 60, the next 1 + m bytes are literal bytes.
-  - Otherwise, let n be the little-endian unsigned integer denoted by the next
-    m - 59 bytes. The next 1 + n bytes after that are literal bytes.
-
-For copy tags, length bytes are copied from offset bytes ago, in the style of
-Lempel-Ziv compression algorithms. In particular:
-  - For l == 1, the offset ranges in [0, 1<<11) and the length in [4, 12).
-    The length is 4 + the low 3 bits of m. The high 3 bits of m form bits 8-10
-    of the offset. The next byte is bits 0-7 of the offset.
-  - For l == 2, the offset ranges in [0, 1<<16) and the length in [1, 65).
-    The length is 1 + m. The offset is the little-endian unsigned integer
-    denoted by the next 2 bytes.
-  - For l == 3, this tag is a legacy format that is no longer supported.
-*/
-const (
-	tagLiteral = 0x00
-	tagCopy1   = 0x01
-	tagCopy2   = 0x02
-	tagCopy4   = 0x03
-)
-
-const (
-	checksumSize    = 4
-	chunkHeaderSize = 4
-	magicChunk      = "\xff\x06\x00\x00" + magicBody
-	magicBody       = "sNaPpY"
-	// https://code.google.com/p/snappy/source/browse/trunk/framing_format.txt says
-	// that "the uncompressed data in a chunk must be no longer than 65536 bytes".
-	maxUncompressedChunkLen = 65536
-)
-
-const (
-	chunkTypeCompressedData   = 0x00
-	chunkTypeUncompressedData = 0x01
-	chunkTypePadding          = 0xfe
-	chunkTypeStreamIdentifier = 0xff
-)
-
-var crcTable = crc32.MakeTable(crc32.Castagnoli)
-
-// crc implements the checksum specified in section 3 of
-// https://code.google.com/p/snappy/source/browse/trunk/framing_format.txt
-func crc(b []byte) uint32 {
-	c := crc32.Update(0, crcTable, b)
-	return uint32(c>>15|c<<17) + 0xa282ead8
-}
diff --git a/Godeps/_workspace/src/github.com/google/go-snappy/snappy/snappy_test.go b/Godeps/_workspace/src/github.com/google/go-snappy/snappy/snappy_test.go
deleted file mode 100644
index 0623385b71d22ebe18ae8b5aae94e64d0825580d..0000000000000000000000000000000000000000
--- a/Godeps/_workspace/src/github.com/google/go-snappy/snappy/snappy_test.go
+++ /dev/null
@@ -1,364 +0,0 @@
-// Copyright 2011 The Snappy-Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package snappy
-
-import (
-	"bytes"
-	"flag"
-	"fmt"
-	"io"
-	"io/ioutil"
-	"math/rand"
-	"net/http"
-	"os"
-	"path/filepath"
-	"strings"
-	"testing"
-)
-
-var (
-	download = flag.Bool("download", false, "If true, download any missing files before running benchmarks")
-	testdata = flag.String("testdata", "testdata", "Directory containing the test data")
-)
-
-func roundtrip(b, ebuf, dbuf []byte) error {
-	e, err := Encode(ebuf, b)
-	if err != nil {
-		return fmt.Errorf("encoding error: %v", err)
-	}
-	d, err := Decode(dbuf, e)
-	if err != nil {
-		return fmt.Errorf("decoding error: %v", err)
-	}
-	if !bytes.Equal(b, d) {
-		return fmt.Errorf("roundtrip mismatch:\n\twant %v\n\tgot  %v", b, d)
-	}
-	return nil
-}
-
-func TestEmpty(t *testing.T) {
-	if err := roundtrip(nil, nil, nil); err != nil {
-		t.Fatal(err)
-	}
-}
-
-func TestSmallCopy(t *testing.T) {
-	for _, ebuf := range [][]byte{nil, make([]byte, 20), make([]byte, 64)} {
-		for _, dbuf := range [][]byte{nil, make([]byte, 20), make([]byte, 64)} {
-			for i := 0; i < 32; i++ {
-				s := "aaaa" + strings.Repeat("b", i) + "aaaabbbb"
-				if err := roundtrip([]byte(s), ebuf, dbuf); err != nil {
-					t.Errorf("len(ebuf)=%d, len(dbuf)=%d, i=%d: %v", len(ebuf), len(dbuf), i, err)
-				}
-			}
-		}
-	}
-}
-
-func TestSmallRand(t *testing.T) {
-	rng := rand.New(rand.NewSource(27354294))
-	for n := 1; n < 20000; n += 23 {
-		b := make([]byte, n)
-		for i := range b {
-			b[i] = uint8(rng.Uint32())
-		}
-		if err := roundtrip(b, nil, nil); err != nil {
-			t.Fatal(err)
-		}
-	}
-}
-
-func TestSmallRegular(t *testing.T) {
-	for n := 1; n < 20000; n += 23 {
-		b := make([]byte, n)
-		for i := range b {
-			b[i] = uint8(i%10 + 'a')
-		}
-		if err := roundtrip(b, nil, nil); err != nil {
-			t.Fatal(err)
-		}
-	}
-}
-
-func cmp(a, b []byte) error {
-	if len(a) != len(b) {
-		return fmt.Errorf("got %d bytes, want %d", len(a), len(b))
-	}
-	for i := range a {
-		if a[i] != b[i] {
-			return fmt.Errorf("byte #%d: got 0x%02x, want 0x%02x", i, a[i], b[i])
-		}
-	}
-	return nil
-}
-
-func TestFramingFormat(t *testing.T) {
-	// src is comprised of alternating 1e5-sized sequences of random
-	// (incompressible) bytes and repeated (compressible) bytes. 1e5 was chosen
-	// because it is larger than maxUncompressedChunkLen (64k).
-	src := make([]byte, 1e6)
-	rng := rand.New(rand.NewSource(1))
-	for i := 0; i < 10; i++ {
-		if i%2 == 0 {
-			for j := 0; j < 1e5; j++ {
-				src[1e5*i+j] = uint8(rng.Intn(256))
-			}
-		} else {
-			for j := 0; j < 1e5; j++ {
-				src[1e5*i+j] = uint8(i)
-			}
-		}
-	}
-
-	buf := new(bytes.Buffer)
-	if _, err := NewWriter(buf).Write(src); err != nil {
-		t.Fatalf("Write: encoding: %v", err)
-	}
-	dst, err := ioutil.ReadAll(NewReader(buf))
-	if err != nil {
-		t.Fatalf("ReadAll: decoding: %v", err)
-	}
-	if err := cmp(dst, src); err != nil {
-		t.Fatal(err)
-	}
-}
-
-func TestReaderReset(t *testing.T) {
-	gold := bytes.Repeat([]byte("All that is gold does not glitter,\n"), 10000)
-	buf := new(bytes.Buffer)
-	if _, err := NewWriter(buf).Write(gold); err != nil {
-		t.Fatalf("Write: %v", err)
-	}
-	encoded, invalid, partial := buf.String(), "invalid", "partial"
-	r := NewReader(nil)
-	for i, s := range []string{encoded, invalid, partial, encoded, partial, invalid, encoded, encoded} {
-		if s == partial {
-			r.Reset(strings.NewReader(encoded))
-			if _, err := r.Read(make([]byte, 101)); err != nil {
-				t.Errorf("#%d: %v", i, err)
-				continue
-			}
-			continue
-		}
-		r.Reset(strings.NewReader(s))
-		got, err := ioutil.ReadAll(r)
-		switch s {
-		case encoded:
-			if err != nil {
-				t.Errorf("#%d: %v", i, err)
-				continue
-			}
-			if err := cmp(got, gold); err != nil {
-				t.Errorf("#%d: %v", i, err)
-				continue
-			}
-		case invalid:
-			if err == nil {
-				t.Errorf("#%d: got nil error, want non-nil", i)
-				continue
-			}
-		}
-	}
-}
-
-func TestWriterReset(t *testing.T) {
-	gold := bytes.Repeat([]byte("Not all those who wander are lost;\n"), 10000)
-	var gots, wants [][]byte
-	const n = 20
-	w, failed := NewWriter(nil), false
-	for i := 0; i <= n; i++ {
-		buf := new(bytes.Buffer)
-		w.Reset(buf)
-		want := gold[:len(gold)*i/n]
-		if _, err := w.Write(want); err != nil {
-			t.Errorf("#%d: Write: %v", i, err)
-			failed = true
-			continue
-		}
-		got, err := ioutil.ReadAll(NewReader(buf))
-		if err != nil {
-			t.Errorf("#%d: ReadAll: %v", i, err)
-			failed = true
-			continue
-		}
-		gots = append(gots, got)
-		wants = append(wants, want)
-	}
-	if failed {
-		return
-	}
-	for i := range gots {
-		if err := cmp(gots[i], wants[i]); err != nil {
-			t.Errorf("#%d: %v", i, err)
-		}
-	}
-}
-
-func benchDecode(b *testing.B, src []byte) {
-	encoded, err := Encode(nil, src)
-	if err != nil {
-		b.Fatal(err)
-	}
-	// Bandwidth is in amount of uncompressed data.
-	b.SetBytes(int64(len(src)))
-	b.ResetTimer()
-	for i := 0; i < b.N; i++ {
-		Decode(src, encoded)
-	}
-}
-
-func benchEncode(b *testing.B, src []byte) {
-	// Bandwidth is in amount of uncompressed data.
-	b.SetBytes(int64(len(src)))
-	dst := make([]byte, MaxEncodedLen(len(src)))
-	b.ResetTimer()
-	for i := 0; i < b.N; i++ {
-		Encode(dst, src)
-	}
-}
-
-func readFile(b testing.TB, filename string) []byte {
-	src, err := ioutil.ReadFile(filename)
-	if err != nil {
-		b.Fatalf("failed reading %s: %s", filename, err)
-	}
-	if len(src) == 0 {
-		b.Fatalf("%s has zero length", filename)
-	}
-	return src
-}
-
-// expand returns a slice of length n containing repeated copies of src.
-func expand(src []byte, n int) []byte {
-	dst := make([]byte, n)
-	for x := dst; len(x) > 0; {
-		i := copy(x, src)
-		x = x[i:]
-	}
-	return dst
-}
-
-func benchWords(b *testing.B, n int, decode bool) {
-	// Note: the file is OS-language dependent so the resulting values are not
-	// directly comparable for non-US-English OS installations.
-	data := expand(readFile(b, "/usr/share/dict/words"), n)
-	if decode {
-		benchDecode(b, data)
-	} else {
-		benchEncode(b, data)
-	}
-}
-
-func BenchmarkWordsDecode1e3(b *testing.B) { benchWords(b, 1e3, true) }
-func BenchmarkWordsDecode1e4(b *testing.B) { benchWords(b, 1e4, true) }
-func BenchmarkWordsDecode1e5(b *testing.B) { benchWords(b, 1e5, true) }
-func BenchmarkWordsDecode1e6(b *testing.B) { benchWords(b, 1e6, true) }
-func BenchmarkWordsEncode1e3(b *testing.B) { benchWords(b, 1e3, false) }
-func BenchmarkWordsEncode1e4(b *testing.B) { benchWords(b, 1e4, false) }
-func BenchmarkWordsEncode1e5(b *testing.B) { benchWords(b, 1e5, false) }
-func BenchmarkWordsEncode1e6(b *testing.B) { benchWords(b, 1e6, false) }
-
-// testFiles' values are copied directly from
-// https://raw.githubusercontent.com/google/snappy/master/snappy_unittest.cc
-// The label field is unused in snappy-go.
-var testFiles = []struct {
-	label    string
-	filename string
-}{
-	{"html", "html"},
-	{"urls", "urls.10K"},
-	{"jpg", "fireworks.jpeg"},
-	{"jpg_200", "fireworks.jpeg"},
-	{"pdf", "paper-100k.pdf"},
-	{"html4", "html_x_4"},
-	{"txt1", "alice29.txt"},
-	{"txt2", "asyoulik.txt"},
-	{"txt3", "lcet10.txt"},
-	{"txt4", "plrabn12.txt"},
-	{"pb", "geo.protodata"},
-	{"gaviota", "kppkn.gtb"},
-}
-
-// The test data files are present at this canonical URL.
-const baseURL = "https://raw.githubusercontent.com/google/snappy/master/testdata/"
-
-func downloadTestdata(basename string) (errRet error) {
-	filename := filepath.Join(*testdata, basename)
-	if stat, err := os.Stat(filename); err == nil && stat.Size() != 0 {
-		return nil
-	}
-
-	if !*download {
-		return fmt.Errorf("test data not found; skipping benchmark without the -download flag")
-	}
-	// Download the official snappy C++ implementation reference test data
-	// files for benchmarking.
-	if err := os.Mkdir(*testdata, 0777); err != nil && !os.IsExist(err) {
-		return fmt.Errorf("failed to create testdata: %s", err)
-	}
-
-	f, err := os.Create(filename)
-	if err != nil {
-		return fmt.Errorf("failed to create %s: %s", filename, err)
-	}
-	defer f.Close()
-	defer func() {
-		if errRet != nil {
-			os.Remove(filename)
-		}
-	}()
-	url := baseURL + basename
-	resp, err := http.Get(url)
-	if err != nil {
-		return fmt.Errorf("failed to download %s: %s", url, err)
-	}
-	defer resp.Body.Close()
-	if s := resp.StatusCode; s != http.StatusOK {
-		return fmt.Errorf("downloading %s: HTTP status code %d (%s)", url, s, http.StatusText(s))
-	}
-	_, err = io.Copy(f, resp.Body)
-	if err != nil {
-		return fmt.Errorf("failed to download %s to %s: %s", url, filename, err)
-	}
-	return nil
-}
-
-func benchFile(b *testing.B, n int, decode bool) {
-	if err := downloadTestdata(testFiles[n].filename); err != nil {
-		b.Fatalf("failed to download testdata: %s", err)
-	}
-	data := readFile(b, filepath.Join(*testdata, testFiles[n].filename))
-	if decode {
-		benchDecode(b, data)
-	} else {
-		benchEncode(b, data)
-	}
-}
-
-// Naming convention is kept similar to what snappy's C++ implementation uses.
-func Benchmark_UFlat0(b *testing.B)  { benchFile(b, 0, true) }
-func Benchmark_UFlat1(b *testing.B)  { benchFile(b, 1, true) }
-func Benchmark_UFlat2(b *testing.B)  { benchFile(b, 2, true) }
-func Benchmark_UFlat3(b *testing.B)  { benchFile(b, 3, true) }
-func Benchmark_UFlat4(b *testing.B)  { benchFile(b, 4, true) }
-func Benchmark_UFlat5(b *testing.B)  { benchFile(b, 5, true) }
-func Benchmark_UFlat6(b *testing.B)  { benchFile(b, 6, true) }
-func Benchmark_UFlat7(b *testing.B)  { benchFile(b, 7, true) }
-func Benchmark_UFlat8(b *testing.B)  { benchFile(b, 8, true) }
-func Benchmark_UFlat9(b *testing.B)  { benchFile(b, 9, true) }
-func Benchmark_UFlat10(b *testing.B) { benchFile(b, 10, true) }
-func Benchmark_UFlat11(b *testing.B) { benchFile(b, 11, true) }
-func Benchmark_ZFlat0(b *testing.B)  { benchFile(b, 0, false) }
-func Benchmark_ZFlat1(b *testing.B)  { benchFile(b, 1, false) }
-func Benchmark_ZFlat2(b *testing.B)  { benchFile(b, 2, false) }
-func Benchmark_ZFlat3(b *testing.B)  { benchFile(b, 3, false) }
-func Benchmark_ZFlat4(b *testing.B)  { benchFile(b, 4, false) }
-func Benchmark_ZFlat5(b *testing.B)  { benchFile(b, 5, false) }
-func Benchmark_ZFlat6(b *testing.B)  { benchFile(b, 6, false) }
-func Benchmark_ZFlat7(b *testing.B)  { benchFile(b, 7, false) }
-func Benchmark_ZFlat8(b *testing.B)  { benchFile(b, 8, false) }
-func Benchmark_ZFlat9(b *testing.B)  { benchFile(b, 9, false) }
-func Benchmark_ZFlat10(b *testing.B) { benchFile(b, 10, false) }
-func Benchmark_ZFlat11(b *testing.B) { benchFile(b, 11, false) }
diff --git a/Godeps/_workspace/src/github.com/gorilla/websocket/examples/autobahn/server.go b/Godeps/_workspace/src/github.com/gorilla/websocket/examples/autobahn/server.go
index ea50cd55830a62c13cc6cbea47bd49953b31d126..d96ac84dbf282d639c2619f233e124cedcb7a0d0 100644
--- a/Godeps/_workspace/src/github.com/gorilla/websocket/examples/autobahn/server.go
+++ b/Godeps/_workspace/src/github.com/gorilla/websocket/examples/autobahn/server.go
@@ -8,7 +8,7 @@ package main
 import (
 	"errors"
 	"flag"
-	"github.comgorilla/websocket"
+	"github.com/gorilla/websocket"
 	"io"
 	"log"
 	"net/http"
diff --git a/Godeps/_workspace/src/github.com/gorilla/websocket/examples/chat/conn.go b/Godeps/_workspace/src/github.com/gorilla/websocket/examples/chat/conn.go
index 8ab247505cf0b769de677e05e669c2409c6139b7..7cc0496c3e05d930ce8e47b218b696af3cad33d4 100644
--- a/Godeps/_workspace/src/github.com/gorilla/websocket/examples/chat/conn.go
+++ b/Godeps/_workspace/src/github.com/gorilla/websocket/examples/chat/conn.go
@@ -5,7 +5,7 @@
 package main
 
 import (
-	"github.comgorilla/websocket"
+	"github.com/gorilla/websocket"
 	"log"
 	"net/http"
 	"time"
diff --git a/Godeps/_workspace/src/github.com/gorilla/websocket/examples/filewatch/main.go b/Godeps/_workspace/src/github.com/gorilla/websocket/examples/filewatch/main.go
index 2baefee129f6b843cd1af9fff31e93112f5c7579..a2c7b85fab38b96b19c9c6145b80f95cd5262dea 100644
--- a/Godeps/_workspace/src/github.com/gorilla/websocket/examples/filewatch/main.go
+++ b/Godeps/_workspace/src/github.com/gorilla/websocket/examples/filewatch/main.go
@@ -14,7 +14,7 @@ import (
 	"text/template"
 	"time"
 
-	"github.comgorilla/websocket"
+	"github.com/gorilla/websocket"
 )
 
 const (
diff --git a/Godeps/_workspace/src/github.com/inconshreveable/log15/stack/stack_test.go b/Godeps/_workspace/src/github.com/inconshreveable/log15/stack/stack_test.go
index 7d6f7949c174b8e690300e76b3ab319059834c0c..52371b1e45ab1ac08469a56607133e18cc6716d5 100644
--- a/Godeps/_workspace/src/github.com/inconshreveable/log15/stack/stack_test.go
+++ b/Godeps/_workspace/src/github.com/inconshreveable/log15/stack/stack_test.go
@@ -9,7 +9,7 @@ import (
 	"runtime"
 	"testing"
 
-	"github.cominconshreveable/log15/stack"
+	"github.com/inconshreveable/log15/stack"
 )
 
 type testType struct{}
diff --git a/Godeps/_workspace/src/github.com/manucorporat/sse/sse_test.go b/Godeps/_workspace/src/github.com/manucorporat/sse/sse_test.go
index b1c2d9bc3a2d55ad6a68ba66f225e415fbc1192c..f1e15440afd80e113863015035c75306fc81888c 100644
--- a/Godeps/_workspace/src/github.com/manucorporat/sse/sse_test.go
+++ b/Godeps/_workspace/src/github.com/manucorporat/sse/sse_test.go
@@ -9,7 +9,7 @@ import (
 	"net/http/httptest"
 	"testing"
 
-	"github.com/stretchr/testify/assert"
+	"github.com/eris-ltd/eris-db/Godeps/_workspace/src/github.com/stretchr/testify/assert"
 )
 
 func TestEncodeOnlyData(t *testing.T) {
diff --git a/Godeps/_workspace/src/github.com/naoina/go-stringutil/strings_bench_test.go b/Godeps/_workspace/src/github.com/naoina/go-stringutil/strings_bench_test.go
index 85b4938388c6986c890ac2b30d25284d3792aba6..90c280bda102f6cf23c7370fdf43231d4c880eb6 100644
--- a/Godeps/_workspace/src/github.com/naoina/go-stringutil/strings_bench_test.go
+++ b/Godeps/_workspace/src/github.com/naoina/go-stringutil/strings_bench_test.go
@@ -3,7 +3,7 @@ package stringutil_test
 import (
 	"testing"
 
-	"github.comnaoina/go-stringutil"
+	"github.com/naoina/go-stringutil"
 )
 
 var benchcaseForCamelCase = "the_quick_brown_fox_jumps_over_the_lazy_dog"
diff --git a/Godeps/_workspace/src/github.com/naoina/go-stringutil/strings_test.go b/Godeps/_workspace/src/github.com/naoina/go-stringutil/strings_test.go
index d00045724f5bb7e9244ca6bba8962892cdce35df..69c831e1238ca7e1068090be1b121b96573b05a2 100644
--- a/Godeps/_workspace/src/github.com/naoina/go-stringutil/strings_test.go
+++ b/Godeps/_workspace/src/github.com/naoina/go-stringutil/strings_test.go
@@ -4,7 +4,7 @@ import (
 	"reflect"
 	"testing"
 
-	"github.comnaoina/go-stringutil"
+	"github.com/naoina/go-stringutil"
 )
 
 func TestToUpperCamelCase(t *testing.T) {
diff --git a/Godeps/_workspace/src/github.com/naoina/toml/decode.go b/Godeps/_workspace/src/github.com/naoina/toml/decode.go
index f8663668f52722ca259488d85a29eaddfb863c7d..c5446fe922d5fbd2e3ca6816f6bcccd268a19e5a 100644
--- a/Godeps/_workspace/src/github.com/naoina/toml/decode.go
+++ b/Godeps/_workspace/src/github.com/naoina/toml/decode.go
@@ -8,7 +8,7 @@ import (
 	"strconv"
 	"strings"
 
-	"github.comnaoina/toml/ast"
+	"github.com/naoina/toml/ast"
 )
 
 const (
diff --git a/Godeps/_workspace/src/github.com/naoina/toml/decode_bench_test.go b/Godeps/_workspace/src/github.com/naoina/toml/decode_bench_test.go
index 1bec0885b7e17aa4decea06266398076d32b4360..b85c1c680ffc50bd35f9789434ac820140d6fb3d 100644
--- a/Godeps/_workspace/src/github.com/naoina/toml/decode_bench_test.go
+++ b/Godeps/_workspace/src/github.com/naoina/toml/decode_bench_test.go
@@ -4,7 +4,7 @@ import (
 	"testing"
 	"time"
 
-	"github.comnaoina/toml"
+	"github.com/naoina/toml"
 )
 
 func BenchmarkUnmarshal(b *testing.B) {
diff --git a/Godeps/_workspace/src/github.com/naoina/toml/decode_test.go b/Godeps/_workspace/src/github.com/naoina/toml/decode_test.go
index f20c5a3756b59c37b8533a810585106caac90708..1fcae9b7abcd64a96572e7640fcd449536d415ad 100644
--- a/Godeps/_workspace/src/github.com/naoina/toml/decode_test.go
+++ b/Godeps/_workspace/src/github.com/naoina/toml/decode_test.go
@@ -8,7 +8,7 @@ import (
 	"testing"
 	"time"
 
-	"github.comnaoina/toml"
+	"github.com/naoina/toml"
 )
 
 const (
diff --git a/Godeps/_workspace/src/github.com/naoina/toml/encode.go b/Godeps/_workspace/src/github.com/naoina/toml/encode.go
index 6a6205f517d7838ead1c31b49944fd0e487affff..1932538e67b9e4f6c3db7b14e85a49a48517d09a 100644
--- a/Godeps/_workspace/src/github.com/naoina/toml/encode.go
+++ b/Godeps/_workspace/src/github.com/naoina/toml/encode.go
@@ -9,7 +9,7 @@ import (
 
 	"go/ast"
 
-	"github.comnaoina/go-stringutil"
+	"github.com/naoina/go-stringutil"
 )
 
 const (
diff --git a/Godeps/_workspace/src/github.com/naoina/toml/encode_test.go b/Godeps/_workspace/src/github.com/naoina/toml/encode_test.go
index 94a7f3e3d65e1bd7153b0e1eab26221a38071aea..17e04fd0a9d501d30e905db2f93333040f4c1c5e 100644
--- a/Godeps/_workspace/src/github.com/naoina/toml/encode_test.go
+++ b/Godeps/_workspace/src/github.com/naoina/toml/encode_test.go
@@ -5,7 +5,7 @@ import (
 	"testing"
 	"time"
 
-	"github.comnaoina/toml"
+	"github.com/naoina/toml"
 )
 
 func TestMarshal(t *testing.T) {
diff --git a/Godeps/_workspace/src/github.com/naoina/toml/parse.go b/Godeps/_workspace/src/github.com/naoina/toml/parse.go
index 3a72102b13898574fc34c447f72b8943fd5a3970..e0186662525a4ae11660a97a6c16b6c683132331 100644
--- a/Godeps/_workspace/src/github.com/naoina/toml/parse.go
+++ b/Godeps/_workspace/src/github.com/naoina/toml/parse.go
@@ -3,7 +3,7 @@ package toml
 import (
 	"fmt"
 
-	"github.comnaoina/toml/ast"
+	"github.com/naoina/toml/ast"
 )
 
 // Parse returns an AST representation of TOML.
diff --git a/Godeps/_workspace/src/github.com/stretchr/testify/require/forward_requirements.go b/Godeps/_workspace/src/github.com/stretchr/testify/require/forward_requirements.go
index 069d4198400a87947695b7cc7eb91ac6bededbd3..62c75b9ca033451c973d8e1b43cb551a7d518957 100644
--- a/Godeps/_workspace/src/github.com/stretchr/testify/require/forward_requirements.go
+++ b/Godeps/_workspace/src/github.com/stretchr/testify/require/forward_requirements.go
@@ -3,7 +3,7 @@ package require
 import (
 	"time"
 
-	"github.com/stretchr/testify/assert"
+	"github.com/eris-ltd/eris-db/Godeps/_workspace/src/github.com/stretchr/testify/assert"
 )
 
 type Assertions struct {
diff --git a/Godeps/_workspace/src/github.com/stretchr/testify/require/requirements.go b/Godeps/_workspace/src/github.com/stretchr/testify/require/requirements.go
index 122a3f3abd874add239f666f4f97880e04f64d91..6b10a61109031a5e61ab3766de6c12bdfbd07959 100644
--- a/Godeps/_workspace/src/github.com/stretchr/testify/require/requirements.go
+++ b/Godeps/_workspace/src/github.com/stretchr/testify/require/requirements.go
@@ -3,7 +3,7 @@ package require
 import (
 	"time"
 
-	"github.com/stretchr/testify/assert"
+	"github.com/eris-ltd/eris-db/Godeps/_workspace/src/github.com/stretchr/testify/assert"
 )
 
 type TestingT interface {
diff --git a/Godeps/_workspace/src/github.com/stretchr/testify/suite/suite.go b/Godeps/_workspace/src/github.com/stretchr/testify/suite/suite.go
index ac6744d479a5d69e9cfd3723da32c8c8a91debd8..4dbe6ecad250e888d05ebd8dff602628ff4e702b 100644
--- a/Godeps/_workspace/src/github.com/stretchr/testify/suite/suite.go
+++ b/Godeps/_workspace/src/github.com/stretchr/testify/suite/suite.go
@@ -8,8 +8,8 @@ import (
 	"regexp"
 	"testing"
 
-	"github.com/stretchr/testify/assert"
-	"github.com/stretchr/testify/require"
+	"github.com/eris-ltd/eris-db/Godeps/_workspace/src/github.com/stretchr/testify/assert"
+	"github.com/eris-ltd/eris-db/Godeps/_workspace/src/github.com/stretchr/testify/require"
 )
 
 var matchMethod = flag.String("m", "", "regular expression to select tests of the suite to run")
diff --git a/Godeps/_workspace/src/github.com/stretchr/testify/suite/suite_test.go b/Godeps/_workspace/src/github.com/stretchr/testify/suite/suite_test.go
index 6a1bb2c6c0ea6d5227267bf4dcf06ae87e61186f..630c5869de0e97302b8d0eebcb07d82151ee692a 100644
--- a/Godeps/_workspace/src/github.com/stretchr/testify/suite/suite_test.go
+++ b/Godeps/_workspace/src/github.com/stretchr/testify/suite/suite_test.go
@@ -6,7 +6,7 @@ import (
 	"os"
 	"testing"
 
-	"github.com/stretchr/testify/assert"
+	"github.com/eris-ltd/eris-db/Godeps/_workspace/src/github.com/stretchr/testify/assert"
 )
 
 // This suite is intended to store values to make sure that only
diff --git a/Godeps/_workspace/src/github.com/syndtr/goleveldb/leveldb/batch.go b/Godeps/_workspace/src/github.com/syndtr/goleveldb/leveldb/batch.go
index b97a2bdb2658f9c1f4ff3e36e6bce3e80c0c3f92..ccf390c9cff4bd120180dd47b5b58e9a0c00b102 100644
--- a/Godeps/_workspace/src/github.com/syndtr/goleveldb/leveldb/batch.go
+++ b/Godeps/_workspace/src/github.com/syndtr/goleveldb/leveldb/batch.go
@@ -10,8 +10,8 @@ import (
 	"encoding/binary"
 	"fmt"
 
-	"github.comsyndtr/goleveldb/leveldb/errors"
-	"github.comsyndtr/goleveldb/leveldb/memdb"
+	"github.com/syndtr/goleveldb/leveldb/errors"
+	"github.com/syndtr/goleveldb/leveldb/memdb"
 )
 
 type ErrBatchCorrupted struct {
diff --git a/Godeps/_workspace/src/github.com/syndtr/goleveldb/leveldb/batch_test.go b/Godeps/_workspace/src/github.com/syndtr/goleveldb/leveldb/batch_test.go
index f437b643a312fca550de45676abe417e60d32aee..7fc842f4fedd6f8dbd9902945d6098d4d556b6f4 100644
--- a/Godeps/_workspace/src/github.com/syndtr/goleveldb/leveldb/batch_test.go
+++ b/Godeps/_workspace/src/github.com/syndtr/goleveldb/leveldb/batch_test.go
@@ -10,8 +10,8 @@ import (
 	"bytes"
 	"testing"
 
-	"github.comsyndtr/goleveldb/leveldb/comparer"
-	"github.comsyndtr/goleveldb/leveldb/memdb"
+	"github.com/syndtr/goleveldb/leveldb/comparer"
+	"github.com/syndtr/goleveldb/leveldb/memdb"
 )
 
 type tbRec struct {
diff --git a/Godeps/_workspace/src/github.com/syndtr/goleveldb/leveldb/bench_test.go b/Godeps/_workspace/src/github.com/syndtr/goleveldb/leveldb/bench_test.go
index c143bc33bae7216a49ce3821ce6295c2436319fd..91b426709d59a8fb0860cec31ba601f9daca3605 100644
--- a/Godeps/_workspace/src/github.com/syndtr/goleveldb/leveldb/bench_test.go
+++ b/Godeps/_workspace/src/github.com/syndtr/goleveldb/leveldb/bench_test.go
@@ -15,9 +15,9 @@ import (
 	"runtime"
 	"testing"
 
-	"github.comsyndtr/goleveldb/leveldb/iterator"
-	"github.comsyndtr/goleveldb/leveldb/opt"
-	"github.comsyndtr/goleveldb/leveldb/storage"
+	"github.com/syndtr/goleveldb/leveldb/iterator"
+	"github.com/syndtr/goleveldb/leveldb/opt"
+	"github.com/syndtr/goleveldb/leveldb/storage"
 )
 
 func randomString(r *rand.Rand, n int) []byte {
diff --git a/Godeps/_workspace/src/github.com/syndtr/goleveldb/leveldb/cache/cache.go b/Godeps/_workspace/src/github.com/syndtr/goleveldb/leveldb/cache/cache.go
index fc193fbc83657ab8f3bd527db31ec9f4df7f7c77..c9670de5de6f70f4ba905df39776f67a42ff32d1 100644
--- a/Godeps/_workspace/src/github.com/syndtr/goleveldb/leveldb/cache/cache.go
+++ b/Godeps/_workspace/src/github.com/syndtr/goleveldb/leveldb/cache/cache.go
@@ -12,7 +12,7 @@ import (
 	"sync/atomic"
 	"unsafe"
 
-	"github.comsyndtr/goleveldb/leveldb/util"
+	"github.com/syndtr/goleveldb/leveldb/util"
 )
 
 // Cacher provides interface to implements a caching functionality.
diff --git a/Godeps/_workspace/src/github.com/syndtr/goleveldb/leveldb/comparer.go b/Godeps/_workspace/src/github.com/syndtr/goleveldb/leveldb/comparer.go
index 4e5c3317ebe066981f0df89327e0bfd45049dbaa..d33d5e9c78fcf566114dce757ffe4ea6e0f0ba46 100644
--- a/Godeps/_workspace/src/github.com/syndtr/goleveldb/leveldb/comparer.go
+++ b/Godeps/_workspace/src/github.com/syndtr/goleveldb/leveldb/comparer.go
@@ -6,7 +6,7 @@
 
 package leveldb
 
-import "github.comsyndtr/goleveldb/leveldb/comparer"
+import "github.com/syndtr/goleveldb/leveldb/comparer"
 
 type iComparer struct {
 	ucmp comparer.Comparer
diff --git a/Godeps/_workspace/src/github.com/syndtr/goleveldb/leveldb/corrupt_test.go b/Godeps/_workspace/src/github.com/syndtr/goleveldb/leveldb/corrupt_test.go
index a4b9df6c968f19183655ebe8e41be3794bfe477f..a351874ed4351f6d0abf67719bf7698d4228216a 100644
--- a/Godeps/_workspace/src/github.com/syndtr/goleveldb/leveldb/corrupt_test.go
+++ b/Godeps/_workspace/src/github.com/syndtr/goleveldb/leveldb/corrupt_test.go
@@ -9,9 +9,9 @@ package leveldb
 import (
 	"bytes"
 	"fmt"
-	"github.comsyndtr/goleveldb/leveldb/filter"
-	"github.comsyndtr/goleveldb/leveldb/opt"
-	"github.comsyndtr/goleveldb/leveldb/storage"
+	"github.com/syndtr/goleveldb/leveldb/filter"
+	"github.com/syndtr/goleveldb/leveldb/opt"
+	"github.com/syndtr/goleveldb/leveldb/storage"
 	"io"
 	"math/rand"
 	"testing"
diff --git a/Godeps/_workspace/src/github.com/syndtr/goleveldb/leveldb/db.go b/Godeps/_workspace/src/github.com/syndtr/goleveldb/leveldb/db.go
index 176f5b7f1ee4ec3d08cac96b622c4c078c4da069..def86bc1aa8240e30aba67c204f0e0c311a48b37 100644
--- a/Godeps/_workspace/src/github.com/syndtr/goleveldb/leveldb/db.go
+++ b/Godeps/_workspace/src/github.com/syndtr/goleveldb/leveldb/db.go
@@ -17,14 +17,14 @@ import (
 	"sync/atomic"
 	"time"
 
-	"github.comsyndtr/goleveldb/leveldb/errors"
-	"github.comsyndtr/goleveldb/leveldb/iterator"
-	"github.comsyndtr/goleveldb/leveldb/journal"
-	"github.comsyndtr/goleveldb/leveldb/memdb"
-	"github.comsyndtr/goleveldb/leveldb/opt"
-	"github.comsyndtr/goleveldb/leveldb/storage"
-	"github.comsyndtr/goleveldb/leveldb/table"
-	"github.comsyndtr/goleveldb/leveldb/util"
+	"github.com/syndtr/goleveldb/leveldb/errors"
+	"github.com/syndtr/goleveldb/leveldb/iterator"
+	"github.com/syndtr/goleveldb/leveldb/journal"
+	"github.com/syndtr/goleveldb/leveldb/memdb"
+	"github.com/syndtr/goleveldb/leveldb/opt"
+	"github.com/syndtr/goleveldb/leveldb/storage"
+	"github.com/syndtr/goleveldb/leveldb/table"
+	"github.com/syndtr/goleveldb/leveldb/util"
 )
 
 // DB is a LevelDB database.
diff --git a/Godeps/_workspace/src/github.com/syndtr/goleveldb/leveldb/db_compaction.go b/Godeps/_workspace/src/github.com/syndtr/goleveldb/leveldb/db_compaction.go
index a69aaf91d13b794c51470cd91ef4b18da1d092b1..26003106ead5ad7436db63da0f49dbfcd1c2cdf1 100644
--- a/Godeps/_workspace/src/github.com/syndtr/goleveldb/leveldb/db_compaction.go
+++ b/Godeps/_workspace/src/github.com/syndtr/goleveldb/leveldb/db_compaction.go
@@ -10,8 +10,8 @@ import (
 	"sync"
 	"time"
 
-	"github.comsyndtr/goleveldb/leveldb/errors"
-	"github.comsyndtr/goleveldb/leveldb/opt"
+	"github.com/syndtr/goleveldb/leveldb/errors"
+	"github.com/syndtr/goleveldb/leveldb/opt"
 )
 
 var (
diff --git a/Godeps/_workspace/src/github.com/syndtr/goleveldb/leveldb/db_iter.go b/Godeps/_workspace/src/github.com/syndtr/goleveldb/leveldb/db_iter.go
index e469226368f08fcb9aebcab62a6dfadcf095e353..656ae98567f38ecae293500a2649021ec9fd525f 100644
--- a/Godeps/_workspace/src/github.com/syndtr/goleveldb/leveldb/db_iter.go
+++ b/Godeps/_workspace/src/github.com/syndtr/goleveldb/leveldb/db_iter.go
@@ -13,9 +13,9 @@ import (
 	"sync"
 	"sync/atomic"
 
-	"github.comsyndtr/goleveldb/leveldb/iterator"
-	"github.comsyndtr/goleveldb/leveldb/opt"
-	"github.comsyndtr/goleveldb/leveldb/util"
+	"github.com/syndtr/goleveldb/leveldb/iterator"
+	"github.com/syndtr/goleveldb/leveldb/opt"
+	"github.com/syndtr/goleveldb/leveldb/util"
 )
 
 var (
diff --git a/Godeps/_workspace/src/github.com/syndtr/goleveldb/leveldb/db_snapshot.go b/Godeps/_workspace/src/github.com/syndtr/goleveldb/leveldb/db_snapshot.go
index 00b954718c6c765c6ce7c95a1f91df8d49a4177a..0372848ff1e4f62ececce67d9abe04d8e08121bd 100644
--- a/Godeps/_workspace/src/github.com/syndtr/goleveldb/leveldb/db_snapshot.go
+++ b/Godeps/_workspace/src/github.com/syndtr/goleveldb/leveldb/db_snapshot.go
@@ -13,9 +13,9 @@ import (
 	"sync"
 	"sync/atomic"
 
-	"github.comsyndtr/goleveldb/leveldb/iterator"
-	"github.comsyndtr/goleveldb/leveldb/opt"
-	"github.comsyndtr/goleveldb/leveldb/util"
+	"github.com/syndtr/goleveldb/leveldb/iterator"
+	"github.com/syndtr/goleveldb/leveldb/opt"
+	"github.com/syndtr/goleveldb/leveldb/util"
 )
 
 type snapshotElement struct {
diff --git a/Godeps/_workspace/src/github.com/syndtr/goleveldb/leveldb/db_state.go b/Godeps/_workspace/src/github.com/syndtr/goleveldb/leveldb/db_state.go
index 5b597dc49860ee7542691875b7fa2f23384bb4d2..24671dd39ede09ec35cc01a5f0e9bdec926a11bc 100644
--- a/Godeps/_workspace/src/github.com/syndtr/goleveldb/leveldb/db_state.go
+++ b/Godeps/_workspace/src/github.com/syndtr/goleveldb/leveldb/db_state.go
@@ -10,8 +10,8 @@ import (
 	"sync/atomic"
 	"time"
 
-	"github.comsyndtr/goleveldb/leveldb/journal"
-	"github.comsyndtr/goleveldb/leveldb/memdb"
+	"github.com/syndtr/goleveldb/leveldb/journal"
+	"github.com/syndtr/goleveldb/leveldb/memdb"
 )
 
 type memDB struct {
diff --git a/Godeps/_workspace/src/github.com/syndtr/goleveldb/leveldb/db_test.go b/Godeps/_workspace/src/github.com/syndtr/goleveldb/leveldb/db_test.go
index d7861cc4a40a7172cf1eaef4d51f99166249e508..9d91ebf1a80e78e399b745edeb8e61bbaa3bf0c8 100644
--- a/Godeps/_workspace/src/github.com/syndtr/goleveldb/leveldb/db_test.go
+++ b/Godeps/_workspace/src/github.com/syndtr/goleveldb/leveldb/db_test.go
@@ -23,13 +23,13 @@ import (
 	"time"
 	"unsafe"
 
-	"github.comsyndtr/goleveldb/leveldb/comparer"
-	"github.comsyndtr/goleveldb/leveldb/errors"
-	"github.comsyndtr/goleveldb/leveldb/filter"
-	"github.comsyndtr/goleveldb/leveldb/iterator"
-	"github.comsyndtr/goleveldb/leveldb/opt"
-	"github.comsyndtr/goleveldb/leveldb/storage"
-	"github.comsyndtr/goleveldb/leveldb/util"
+	"github.com/syndtr/goleveldb/leveldb/comparer"
+	"github.com/syndtr/goleveldb/leveldb/errors"
+	"github.com/syndtr/goleveldb/leveldb/filter"
+	"github.com/syndtr/goleveldb/leveldb/iterator"
+	"github.com/syndtr/goleveldb/leveldb/opt"
+	"github.com/syndtr/goleveldb/leveldb/storage"
+	"github.com/syndtr/goleveldb/leveldb/util"
 )
 
 func tkey(i int) []byte {
diff --git a/Godeps/_workspace/src/github.com/syndtr/goleveldb/leveldb/db_util.go b/Godeps/_workspace/src/github.com/syndtr/goleveldb/leveldb/db_util.go
index 458c116d49218fef44ceddbf93714aa922d78074..a8a2bdf72e173d592b4eba894a2996595cb1af12 100644
--- a/Godeps/_workspace/src/github.com/syndtr/goleveldb/leveldb/db_util.go
+++ b/Godeps/_workspace/src/github.com/syndtr/goleveldb/leveldb/db_util.go
@@ -7,11 +7,11 @@
 package leveldb
 
 import (
-	"github.comsyndtr/goleveldb/leveldb/errors"
-	"github.comsyndtr/goleveldb/leveldb/iterator"
-	"github.comsyndtr/goleveldb/leveldb/opt"
-	"github.comsyndtr/goleveldb/leveldb/storage"
-	"github.comsyndtr/goleveldb/leveldb/util"
+	"github.com/syndtr/goleveldb/leveldb/errors"
+	"github.com/syndtr/goleveldb/leveldb/iterator"
+	"github.com/syndtr/goleveldb/leveldb/opt"
+	"github.com/syndtr/goleveldb/leveldb/storage"
+	"github.com/syndtr/goleveldb/leveldb/util"
 )
 
 // Reader is the interface that wraps basic Get and NewIterator methods.
diff --git a/Godeps/_workspace/src/github.com/syndtr/goleveldb/leveldb/db_write.go b/Godeps/_workspace/src/github.com/syndtr/goleveldb/leveldb/db_write.go
index 5deceea6475b46c201a68bfc116f8e22183814d5..176ee893f10c6896ceb5e2cabaa2f38426c7c1c8 100644
--- a/Godeps/_workspace/src/github.com/syndtr/goleveldb/leveldb/db_write.go
+++ b/Godeps/_workspace/src/github.com/syndtr/goleveldb/leveldb/db_write.go
@@ -9,9 +9,9 @@ package leveldb
 import (
 	"time"
 
-	"github.comsyndtr/goleveldb/leveldb/memdb"
-	"github.comsyndtr/goleveldb/leveldb/opt"
-	"github.comsyndtr/goleveldb/leveldb/util"
+	"github.com/syndtr/goleveldb/leveldb/memdb"
+	"github.com/syndtr/goleveldb/leveldb/opt"
+	"github.com/syndtr/goleveldb/leveldb/util"
 )
 
 func (db *DB) writeJournal(b *Batch) error {
diff --git a/Godeps/_workspace/src/github.com/syndtr/goleveldb/leveldb/errors.go b/Godeps/_workspace/src/github.com/syndtr/goleveldb/leveldb/errors.go
index 4014756b8510ed0592c5e6828e230f2cf2549d8d..c8bd66a5aa9ab6aded8e4782358e4621c3e019e7 100644
--- a/Godeps/_workspace/src/github.com/syndtr/goleveldb/leveldb/errors.go
+++ b/Godeps/_workspace/src/github.com/syndtr/goleveldb/leveldb/errors.go
@@ -7,7 +7,7 @@
 package leveldb
 
 import (
-	"github.comsyndtr/goleveldb/leveldb/errors"
+	"github.com/syndtr/goleveldb/leveldb/errors"
 )
 
 var (
diff --git a/Godeps/_workspace/src/github.com/syndtr/goleveldb/leveldb/errors/errors.go b/Godeps/_workspace/src/github.com/syndtr/goleveldb/leveldb/errors/errors.go
index 55b45fca261f09c77fb5cd884818a1573f9a5f10..84b5d6b7b2149744c0098d7ca31b0669554be8ed 100644
--- a/Godeps/_workspace/src/github.com/syndtr/goleveldb/leveldb/errors/errors.go
+++ b/Godeps/_workspace/src/github.com/syndtr/goleveldb/leveldb/errors/errors.go
@@ -11,8 +11,8 @@ import (
 	"errors"
 	"fmt"
 
-	"github.comsyndtr/goleveldb/leveldb/storage"
-	"github.comsyndtr/goleveldb/leveldb/util"
+	"github.com/syndtr/goleveldb/leveldb/storage"
+	"github.com/syndtr/goleveldb/leveldb/util"
 )
 
 var (
diff --git a/Godeps/_workspace/src/github.com/syndtr/goleveldb/leveldb/external_test.go b/Godeps/_workspace/src/github.com/syndtr/goleveldb/leveldb/external_test.go
index dc5ee6b5b4038aff599709190c042193b437bbd6..b328ece4e2caffe0b1004bed2047d3a3cb56eb4d 100644
--- a/Godeps/_workspace/src/github.com/syndtr/goleveldb/leveldb/external_test.go
+++ b/Godeps/_workspace/src/github.com/syndtr/goleveldb/leveldb/external_test.go
@@ -10,8 +10,8 @@ import (
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
 
-	"github.comsyndtr/goleveldb/leveldb/opt"
-	"github.comsyndtr/goleveldb/leveldb/testutil"
+	"github.com/syndtr/goleveldb/leveldb/opt"
+	"github.com/syndtr/goleveldb/leveldb/testutil"
 )
 
 var _ = testutil.Defer(func() {
diff --git a/Godeps/_workspace/src/github.com/syndtr/goleveldb/leveldb/filter.go b/Godeps/_workspace/src/github.com/syndtr/goleveldb/leveldb/filter.go
index 40835752c9af9ef1d04c3fd234f2fbea35f0731e..37c1e146bcc088a5f7dc7ba621d68f3a9c7c8509 100644
--- a/Godeps/_workspace/src/github.com/syndtr/goleveldb/leveldb/filter.go
+++ b/Godeps/_workspace/src/github.com/syndtr/goleveldb/leveldb/filter.go
@@ -7,7 +7,7 @@
 package leveldb
 
 import (
-	"github.comsyndtr/goleveldb/leveldb/filter"
+	"github.com/syndtr/goleveldb/leveldb/filter"
 )
 
 type iFilter struct {
diff --git a/Godeps/_workspace/src/github.com/syndtr/goleveldb/leveldb/filter/bloom.go b/Godeps/_workspace/src/github.com/syndtr/goleveldb/leveldb/filter/bloom.go
index a6bd631c50a5aeeb7721534c40afaf1f70c1387b..bab0e99705f59201d6920633893012938dc8a592 100644
--- a/Godeps/_workspace/src/github.com/syndtr/goleveldb/leveldb/filter/bloom.go
+++ b/Godeps/_workspace/src/github.com/syndtr/goleveldb/leveldb/filter/bloom.go
@@ -7,7 +7,7 @@
 package filter
 
 import (
-	"github.comsyndtr/goleveldb/leveldb/util"
+	"github.com/syndtr/goleveldb/leveldb/util"
 )
 
 func bloomHash(key []byte) uint32 {
diff --git a/Godeps/_workspace/src/github.com/syndtr/goleveldb/leveldb/filter/bloom_test.go b/Godeps/_workspace/src/github.com/syndtr/goleveldb/leveldb/filter/bloom_test.go
index d61e2b354b6298078bfd87c3b8bc69d6d6c12a91..1fb56f07136f23a4314455852a242109587fbcd6 100644
--- a/Godeps/_workspace/src/github.com/syndtr/goleveldb/leveldb/filter/bloom_test.go
+++ b/Godeps/_workspace/src/github.com/syndtr/goleveldb/leveldb/filter/bloom_test.go
@@ -8,7 +8,7 @@ package filter
 
 import (
 	"encoding/binary"
-	"github.comsyndtr/goleveldb/leveldb/util"
+	"github.com/syndtr/goleveldb/leveldb/util"
 	"testing"
 )
 
diff --git a/Godeps/_workspace/src/github.com/syndtr/goleveldb/leveldb/iterator/array_iter.go b/Godeps/_workspace/src/github.com/syndtr/goleveldb/leveldb/iterator/array_iter.go
index 39b851fe1695c9f6b4373b8a837e0e5ef9380a0c..a23ab05f70fe8e45c0c0a8e0e4617884219a0cbf 100644
--- a/Godeps/_workspace/src/github.com/syndtr/goleveldb/leveldb/iterator/array_iter.go
+++ b/Godeps/_workspace/src/github.com/syndtr/goleveldb/leveldb/iterator/array_iter.go
@@ -7,7 +7,7 @@
 package iterator
 
 import (
-	"github.comsyndtr/goleveldb/leveldb/util"
+	"github.com/syndtr/goleveldb/leveldb/util"
 )
 
 // BasicArray is the interface that wraps basic Len and Search method.
diff --git a/Godeps/_workspace/src/github.com/syndtr/goleveldb/leveldb/iterator/array_iter_test.go b/Godeps/_workspace/src/github.com/syndtr/goleveldb/leveldb/iterator/array_iter_test.go
index 4520f6b15cf1d44cc6e07869cd7a04dc1269ac27..1ed6d07cbb6e041e4e999112fa3ccf0ec1328c6b 100644
--- a/Godeps/_workspace/src/github.com/syndtr/goleveldb/leveldb/iterator/array_iter_test.go
+++ b/Godeps/_workspace/src/github.com/syndtr/goleveldb/leveldb/iterator/array_iter_test.go
@@ -9,8 +9,8 @@ package iterator_test
 import (
 	. "github.com/onsi/ginkgo"
 
-	. "github.comsyndtr/goleveldb/leveldb/iterator"
-	"github.comsyndtr/goleveldb/leveldb/testutil"
+	. "github.com/syndtr/goleveldb/leveldb/iterator"
+	"github.com/syndtr/goleveldb/leveldb/testutil"
 )
 
 var _ = testutil.Defer(func() {
diff --git a/Godeps/_workspace/src/github.com/syndtr/goleveldb/leveldb/iterator/indexed_iter.go b/Godeps/_workspace/src/github.com/syndtr/goleveldb/leveldb/iterator/indexed_iter.go
index 45b124bc9664908f29c37bcd268907da4baa82bd..939adbb9332bcc2ce462303b9f95c9601fada105 100644
--- a/Godeps/_workspace/src/github.com/syndtr/goleveldb/leveldb/iterator/indexed_iter.go
+++ b/Godeps/_workspace/src/github.com/syndtr/goleveldb/leveldb/iterator/indexed_iter.go
@@ -7,8 +7,8 @@
 package iterator
 
 import (
-	"github.comsyndtr/goleveldb/leveldb/errors"
-	"github.comsyndtr/goleveldb/leveldb/util"
+	"github.com/syndtr/goleveldb/leveldb/errors"
+	"github.com/syndtr/goleveldb/leveldb/util"
 )
 
 // IteratorIndexer is the interface that wraps CommonIterator and basic Get
diff --git a/Godeps/_workspace/src/github.com/syndtr/goleveldb/leveldb/iterator/indexed_iter_test.go b/Godeps/_workspace/src/github.com/syndtr/goleveldb/leveldb/iterator/indexed_iter_test.go
index 49f3e9e0641d7abfc34d28d767c16398f55c2be0..72a7978924ebf0aaa52eefd16ef79ac57a40f086 100644
--- a/Godeps/_workspace/src/github.com/syndtr/goleveldb/leveldb/iterator/indexed_iter_test.go
+++ b/Godeps/_workspace/src/github.com/syndtr/goleveldb/leveldb/iterator/indexed_iter_test.go
@@ -11,9 +11,9 @@ import (
 
 	. "github.com/onsi/ginkgo"
 
-	"github.comsyndtr/goleveldb/leveldb/comparer"
-	. "github.comsyndtr/goleveldb/leveldb/iterator"
-	"github.comsyndtr/goleveldb/leveldb/testutil"
+	"github.com/syndtr/goleveldb/leveldb/comparer"
+	. "github.com/syndtr/goleveldb/leveldb/iterator"
+	"github.com/syndtr/goleveldb/leveldb/testutil"
 )
 
 type keyValue struct {
diff --git a/Godeps/_workspace/src/github.com/syndtr/goleveldb/leveldb/iterator/iter.go b/Godeps/_workspace/src/github.com/syndtr/goleveldb/leveldb/iterator/iter.go
index 32e446c1d3104407204d2ae1ea6ce1b14bb08c78..c2522860b0b8c0477fec8d54068053e22de6a1d4 100644
--- a/Godeps/_workspace/src/github.com/syndtr/goleveldb/leveldb/iterator/iter.go
+++ b/Godeps/_workspace/src/github.com/syndtr/goleveldb/leveldb/iterator/iter.go
@@ -11,7 +11,7 @@ package iterator
 import (
 	"errors"
 
-	"github.comsyndtr/goleveldb/leveldb/util"
+	"github.com/syndtr/goleveldb/leveldb/util"
 )
 
 var (
diff --git a/Godeps/_workspace/src/github.com/syndtr/goleveldb/leveldb/iterator/iter_suite_test.go b/Godeps/_workspace/src/github.com/syndtr/goleveldb/leveldb/iterator/iter_suite_test.go
index bc98a659b083f1fb625d17fb7f51a04d1bc8dc6f..5ef8d5bafb3f265754c74562d987ed2858bb174f 100644
--- a/Godeps/_workspace/src/github.com/syndtr/goleveldb/leveldb/iterator/iter_suite_test.go
+++ b/Godeps/_workspace/src/github.com/syndtr/goleveldb/leveldb/iterator/iter_suite_test.go
@@ -3,7 +3,7 @@ package iterator_test
 import (
 	"testing"
 
-	"github.comsyndtr/goleveldb/leveldb/testutil"
+	"github.com/syndtr/goleveldb/leveldb/testutil"
 )
 
 func TestIterator(t *testing.T) {
diff --git a/Godeps/_workspace/src/github.com/syndtr/goleveldb/leveldb/iterator/merged_iter.go b/Godeps/_workspace/src/github.com/syndtr/goleveldb/leveldb/iterator/merged_iter.go
index 0ad2cf05384d96cef98b81788d53ce37b871a988..1a7e29df8fbd975902e5042031cd777b9a9764ce 100644
--- a/Godeps/_workspace/src/github.com/syndtr/goleveldb/leveldb/iterator/merged_iter.go
+++ b/Godeps/_workspace/src/github.com/syndtr/goleveldb/leveldb/iterator/merged_iter.go
@@ -7,9 +7,9 @@
 package iterator
 
 import (
-	"github.comsyndtr/goleveldb/leveldb/comparer"
-	"github.comsyndtr/goleveldb/leveldb/errors"
-	"github.comsyndtr/goleveldb/leveldb/util"
+	"github.com/syndtr/goleveldb/leveldb/comparer"
+	"github.com/syndtr/goleveldb/leveldb/errors"
+	"github.com/syndtr/goleveldb/leveldb/util"
 )
 
 type dir int
diff --git a/Godeps/_workspace/src/github.com/syndtr/goleveldb/leveldb/iterator/merged_iter_test.go b/Godeps/_workspace/src/github.com/syndtr/goleveldb/leveldb/iterator/merged_iter_test.go
index 45c9d7bdb48810e03579f5818cfe05d884d5c602..e523b63e4b6694cf6e0a016b06830aefdf8e8831 100644
--- a/Godeps/_workspace/src/github.com/syndtr/goleveldb/leveldb/iterator/merged_iter_test.go
+++ b/Godeps/_workspace/src/github.com/syndtr/goleveldb/leveldb/iterator/merged_iter_test.go
@@ -10,9 +10,9 @@ import (
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
 
-	"github.comsyndtr/goleveldb/leveldb/comparer"
-	. "github.comsyndtr/goleveldb/leveldb/iterator"
-	"github.comsyndtr/goleveldb/leveldb/testutil"
+	"github.com/syndtr/goleveldb/leveldb/comparer"
+	. "github.com/syndtr/goleveldb/leveldb/iterator"
+	"github.com/syndtr/goleveldb/leveldb/testutil"
 )
 
 var _ = testutil.Defer(func() {
diff --git a/Godeps/_workspace/src/github.com/syndtr/goleveldb/leveldb/journal/journal.go b/Godeps/_workspace/src/github.com/syndtr/goleveldb/leveldb/journal/journal.go
index 373a1c34287ffa5949990cb56e1093b443462872..6519ec660eb7110425d545d6e7154c0a447a869f 100644
--- a/Godeps/_workspace/src/github.com/syndtr/goleveldb/leveldb/journal/journal.go
+++ b/Godeps/_workspace/src/github.com/syndtr/goleveldb/leveldb/journal/journal.go
@@ -82,8 +82,8 @@ import (
 	"fmt"
 	"io"
 
-	"github.comsyndtr/goleveldb/leveldb/errors"
-	"github.comsyndtr/goleveldb/leveldb/util"
+	"github.com/syndtr/goleveldb/leveldb/errors"
+	"github.com/syndtr/goleveldb/leveldb/util"
 )
 
 // These constants are part of the wire format and should not be changed.
diff --git a/Godeps/_workspace/src/github.com/syndtr/goleveldb/leveldb/key.go b/Godeps/_workspace/src/github.com/syndtr/goleveldb/leveldb/key.go
index b53b5137a7638db2cda292f242d238d8a22415e7..572ae8150c792dd43a3cc0477d1ff44075a51db3 100644
--- a/Godeps/_workspace/src/github.com/syndtr/goleveldb/leveldb/key.go
+++ b/Godeps/_workspace/src/github.com/syndtr/goleveldb/leveldb/key.go
@@ -10,7 +10,7 @@ import (
 	"encoding/binary"
 	"fmt"
 
-	"github.comsyndtr/goleveldb/leveldb/errors"
+	"github.com/syndtr/goleveldb/leveldb/errors"
 )
 
 type ErrIkeyCorrupted struct {
diff --git a/Godeps/_workspace/src/github.com/syndtr/goleveldb/leveldb/key_test.go b/Godeps/_workspace/src/github.com/syndtr/goleveldb/leveldb/key_test.go
index 4a5244cd08672c9dfd707f01be6afeee7d11b3a2..30eadf7847ed9b35495c2ee56f800de9fff79b84 100644
--- a/Godeps/_workspace/src/github.com/syndtr/goleveldb/leveldb/key_test.go
+++ b/Godeps/_workspace/src/github.com/syndtr/goleveldb/leveldb/key_test.go
@@ -10,7 +10,7 @@ import (
 	"bytes"
 	"testing"
 
-	"github.comsyndtr/goleveldb/leveldb/comparer"
+	"github.com/syndtr/goleveldb/leveldb/comparer"
 )
 
 var defaultIComparer = &iComparer{comparer.DefaultComparer}
diff --git a/Godeps/_workspace/src/github.com/syndtr/goleveldb/leveldb/leveldb_suite_test.go b/Godeps/_workspace/src/github.com/syndtr/goleveldb/leveldb/leveldb_suite_test.go
index 00428c84acd73f93e6b5b1b00efd391d98fd39ed..fefa007a7047c7c0f5dcf69769db92d74702a087 100644
--- a/Godeps/_workspace/src/github.com/syndtr/goleveldb/leveldb/leveldb_suite_test.go
+++ b/Godeps/_workspace/src/github.com/syndtr/goleveldb/leveldb/leveldb_suite_test.go
@@ -3,7 +3,7 @@ package leveldb
 import (
 	"testing"
 
-	"github.comsyndtr/goleveldb/leveldb/testutil"
+	"github.com/syndtr/goleveldb/leveldb/testutil"
 )
 
 func TestLevelDB(t *testing.T) {
diff --git a/Godeps/_workspace/src/github.com/syndtr/goleveldb/leveldb/memdb/bench_test.go b/Godeps/_workspace/src/github.com/syndtr/goleveldb/leveldb/memdb/bench_test.go
index ca9b951292b9da9ca62f2be7e5372616727529d6..b05084caa65eb0a607b796d8819dcd0656acdf3f 100644
--- a/Godeps/_workspace/src/github.com/syndtr/goleveldb/leveldb/memdb/bench_test.go
+++ b/Godeps/_workspace/src/github.com/syndtr/goleveldb/leveldb/memdb/bench_test.go
@@ -11,7 +11,7 @@ import (
 	"math/rand"
 	"testing"
 
-	"github.comsyndtr/goleveldb/leveldb/comparer"
+	"github.com/syndtr/goleveldb/leveldb/comparer"
 )
 
 func BenchmarkPut(b *testing.B) {
diff --git a/Godeps/_workspace/src/github.com/syndtr/goleveldb/leveldb/memdb/memdb.go b/Godeps/_workspace/src/github.com/syndtr/goleveldb/leveldb/memdb/memdb.go
index 9a256572dd5f67215e586a1e4e9647763025996c..1395bd928080f5514643e2c7d24a53d57025c702 100644
--- a/Godeps/_workspace/src/github.com/syndtr/goleveldb/leveldb/memdb/memdb.go
+++ b/Godeps/_workspace/src/github.com/syndtr/goleveldb/leveldb/memdb/memdb.go
@@ -11,10 +11,10 @@ import (
 	"math/rand"
 	"sync"
 
-	"github.comsyndtr/goleveldb/leveldb/comparer"
-	"github.comsyndtr/goleveldb/leveldb/errors"
-	"github.comsyndtr/goleveldb/leveldb/iterator"
-	"github.comsyndtr/goleveldb/leveldb/util"
+	"github.com/syndtr/goleveldb/leveldb/comparer"
+	"github.com/syndtr/goleveldb/leveldb/errors"
+	"github.com/syndtr/goleveldb/leveldb/iterator"
+	"github.com/syndtr/goleveldb/leveldb/util"
 )
 
 var (
diff --git a/Godeps/_workspace/src/github.com/syndtr/goleveldb/leveldb/memdb/memdb_suite_test.go b/Godeps/_workspace/src/github.com/syndtr/goleveldb/leveldb/memdb/memdb_suite_test.go
index 96235815f9402a29de926cb41c5e28b2b3528dfe..18c304b7f19a6c66b008e7fe2f6d879cf0a0a6ad 100644
--- a/Godeps/_workspace/src/github.com/syndtr/goleveldb/leveldb/memdb/memdb_suite_test.go
+++ b/Godeps/_workspace/src/github.com/syndtr/goleveldb/leveldb/memdb/memdb_suite_test.go
@@ -3,7 +3,7 @@ package memdb
 import (
 	"testing"
 
-	"github.comsyndtr/goleveldb/leveldb/testutil"
+	"github.com/syndtr/goleveldb/leveldb/testutil"
 )
 
 func TestMemDB(t *testing.T) {
diff --git a/Godeps/_workspace/src/github.com/syndtr/goleveldb/leveldb/memdb/memdb_test.go b/Godeps/_workspace/src/github.com/syndtr/goleveldb/leveldb/memdb/memdb_test.go
index 5820727d4012f41c254b7aa89f829180fe7a3651..5dd6dbc7b7bbdb1d3e252c3cc1bb1995eb99ae4a 100644
--- a/Godeps/_workspace/src/github.com/syndtr/goleveldb/leveldb/memdb/memdb_test.go
+++ b/Godeps/_workspace/src/github.com/syndtr/goleveldb/leveldb/memdb/memdb_test.go
@@ -10,10 +10,10 @@ import (
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
 
-	"github.comsyndtr/goleveldb/leveldb/comparer"
-	"github.comsyndtr/goleveldb/leveldb/iterator"
-	"github.comsyndtr/goleveldb/leveldb/testutil"
-	"github.comsyndtr/goleveldb/leveldb/util"
+	"github.com/syndtr/goleveldb/leveldb/comparer"
+	"github.com/syndtr/goleveldb/leveldb/iterator"
+	"github.com/syndtr/goleveldb/leveldb/testutil"
+	"github.com/syndtr/goleveldb/leveldb/util"
 )
 
 func (p *DB) TestFindLT(key []byte) (rkey, value []byte, err error) {
diff --git a/Godeps/_workspace/src/github.com/syndtr/goleveldb/leveldb/opt/options.go b/Godeps/_workspace/src/github.com/syndtr/goleveldb/leveldb/opt/options.go
index 5c74f5a881d6f91911f79c8e806b9f9795ccc8d4..f9a309dac6f499fffaee3138179b1c0b46bd2912 100644
--- a/Godeps/_workspace/src/github.com/syndtr/goleveldb/leveldb/opt/options.go
+++ b/Godeps/_workspace/src/github.com/syndtr/goleveldb/leveldb/opt/options.go
@@ -8,9 +8,9 @@
 package opt
 
 import (
-	"github.comsyndtr/goleveldb/leveldb/cache"
-	"github.comsyndtr/goleveldb/leveldb/comparer"
-	"github.comsyndtr/goleveldb/leveldb/filter"
+	"github.com/syndtr/goleveldb/leveldb/cache"
+	"github.com/syndtr/goleveldb/leveldb/comparer"
+	"github.com/syndtr/goleveldb/leveldb/filter"
 	"math"
 )
 
diff --git a/Godeps/_workspace/src/github.com/syndtr/goleveldb/leveldb/options.go b/Godeps/_workspace/src/github.com/syndtr/goleveldb/leveldb/options.go
index 275179e60c0835f34957ee2811b7c2e403073e3f..a3d84ef60d53d4afb73ba7bdf1f848ebbb202808 100644
--- a/Godeps/_workspace/src/github.com/syndtr/goleveldb/leveldb/options.go
+++ b/Godeps/_workspace/src/github.com/syndtr/goleveldb/leveldb/options.go
@@ -7,8 +7,8 @@
 package leveldb
 
 import (
-	"github.comsyndtr/goleveldb/leveldb/filter"
-	"github.comsyndtr/goleveldb/leveldb/opt"
+	"github.com/syndtr/goleveldb/leveldb/filter"
+	"github.com/syndtr/goleveldb/leveldb/opt"
 )
 
 func dupOptions(o *opt.Options) *opt.Options {
diff --git a/Godeps/_workspace/src/github.com/syndtr/goleveldb/leveldb/session.go b/Godeps/_workspace/src/github.com/syndtr/goleveldb/leveldb/session.go
index cd7429758532a6fc2eeb12d9a07e6e05a42a5ed4..f0bba4602ca528493576243aaef1da156556cb58 100644
--- a/Godeps/_workspace/src/github.com/syndtr/goleveldb/leveldb/session.go
+++ b/Godeps/_workspace/src/github.com/syndtr/goleveldb/leveldb/session.go
@@ -12,11 +12,11 @@ import (
 	"os"
 	"sync"
 
-	"github.comsyndtr/goleveldb/leveldb/errors"
-	"github.comsyndtr/goleveldb/leveldb/journal"
-	"github.comsyndtr/goleveldb/leveldb/opt"
-	"github.comsyndtr/goleveldb/leveldb/storage"
-	"github.comsyndtr/goleveldb/leveldb/util"
+	"github.com/syndtr/goleveldb/leveldb/errors"
+	"github.com/syndtr/goleveldb/leveldb/journal"
+	"github.com/syndtr/goleveldb/leveldb/opt"
+	"github.com/syndtr/goleveldb/leveldb/storage"
+	"github.com/syndtr/goleveldb/leveldb/util"
 )
 
 type ErrManifestCorrupted struct {
diff --git a/Godeps/_workspace/src/github.com/syndtr/goleveldb/leveldb/session_compaction.go b/Godeps/_workspace/src/github.com/syndtr/goleveldb/leveldb/session_compaction.go
index 9390dcf133e2869bd7965205368df0e163cf882d..7c5a79418cc4bb2a3bf70ba7314c4804e04349f9 100644
--- a/Godeps/_workspace/src/github.com/syndtr/goleveldb/leveldb/session_compaction.go
+++ b/Godeps/_workspace/src/github.com/syndtr/goleveldb/leveldb/session_compaction.go
@@ -9,9 +9,9 @@ package leveldb
 import (
 	"sync/atomic"
 
-	"github.comsyndtr/goleveldb/leveldb/iterator"
-	"github.comsyndtr/goleveldb/leveldb/memdb"
-	"github.comsyndtr/goleveldb/leveldb/opt"
+	"github.com/syndtr/goleveldb/leveldb/iterator"
+	"github.com/syndtr/goleveldb/leveldb/memdb"
+	"github.com/syndtr/goleveldb/leveldb/opt"
 )
 
 func (s *session) pickMemdbLevel(umin, umax []byte) int {
diff --git a/Godeps/_workspace/src/github.com/syndtr/goleveldb/leveldb/session_record.go b/Godeps/_workspace/src/github.com/syndtr/goleveldb/leveldb/session_record.go
index 473367f53fc1c51b308ca1bfa9005f0a3d05f67a..405e07bef4f1f7b881044a7e449d96b99c4bd68e 100644
--- a/Godeps/_workspace/src/github.com/syndtr/goleveldb/leveldb/session_record.go
+++ b/Godeps/_workspace/src/github.com/syndtr/goleveldb/leveldb/session_record.go
@@ -12,7 +12,7 @@ import (
 	"io"
 	"strings"
 
-	"github.comsyndtr/goleveldb/leveldb/errors"
+	"github.com/syndtr/goleveldb/leveldb/errors"
 )
 
 type byteReader interface {
diff --git a/Godeps/_workspace/src/github.com/syndtr/goleveldb/leveldb/session_record_test.go b/Godeps/_workspace/src/github.com/syndtr/goleveldb/leveldb/session_record_test.go
index e0711e2f1a7b85db5b290a612941009fa945e853..33c14875618b53cd0408e77f4819c47adf9a1994 100644
--- a/Godeps/_workspace/src/github.com/syndtr/goleveldb/leveldb/session_record_test.go
+++ b/Godeps/_workspace/src/github.com/syndtr/goleveldb/leveldb/session_record_test.go
@@ -10,7 +10,7 @@ import (
 	"bytes"
 	"testing"
 
-	"github.comsyndtr/goleveldb/leveldb/opt"
+	"github.com/syndtr/goleveldb/leveldb/opt"
 )
 
 func decodeEncode(v *sessionRecord) (res bool, err error) {
diff --git a/Godeps/_workspace/src/github.com/syndtr/goleveldb/leveldb/session_util.go b/Godeps/_workspace/src/github.com/syndtr/goleveldb/leveldb/session_util.go
index 6882467100525f1e3815698cb99f52540fe33f48..399a788bad2de7b07974e09f14e400f99e484d06 100644
--- a/Godeps/_workspace/src/github.com/syndtr/goleveldb/leveldb/session_util.go
+++ b/Godeps/_workspace/src/github.com/syndtr/goleveldb/leveldb/session_util.go
@@ -10,8 +10,8 @@ import (
 	"fmt"
 	"sync/atomic"
 
-	"github.comsyndtr/goleveldb/leveldb/journal"
-	"github.comsyndtr/goleveldb/leveldb/storage"
+	"github.com/syndtr/goleveldb/leveldb/journal"
+	"github.com/syndtr/goleveldb/leveldb/storage"
 )
 
 // Logging.
diff --git a/Godeps/_workspace/src/github.com/syndtr/goleveldb/leveldb/storage/file_storage.go b/Godeps/_workspace/src/github.com/syndtr/goleveldb/leveldb/storage/file_storage.go
index eecdfa1e8739715d43944204aa8c604d20b0e203..46cc9d07012e91141cae7c08903f8421c394c412 100644
--- a/Godeps/_workspace/src/github.com/syndtr/goleveldb/leveldb/storage/file_storage.go
+++ b/Godeps/_workspace/src/github.com/syndtr/goleveldb/leveldb/storage/file_storage.go
@@ -18,7 +18,7 @@ import (
 	"sync"
 	"time"
 
-	"github.comsyndtr/goleveldb/leveldb/util"
+	"github.com/syndtr/goleveldb/leveldb/util"
 )
 
 var errFileOpen = errors.New("leveldb/storage: file still open")
diff --git a/Godeps/_workspace/src/github.com/syndtr/goleveldb/leveldb/storage/mem_storage.go b/Godeps/_workspace/src/github.com/syndtr/goleveldb/leveldb/storage/mem_storage.go
index 71ab705dfdea03e6e536ac18ca4e319a4aeb51f2..fc1c8165df1a0d05d432e47889fe8ccb0b943c7f 100644
--- a/Godeps/_workspace/src/github.com/syndtr/goleveldb/leveldb/storage/mem_storage.go
+++ b/Godeps/_workspace/src/github.com/syndtr/goleveldb/leveldb/storage/mem_storage.go
@@ -11,7 +11,7 @@ import (
 	"os"
 	"sync"
 
-	"github.comsyndtr/goleveldb/leveldb/util"
+	"github.com/syndtr/goleveldb/leveldb/util"
 )
 
 const typeShift = 3
diff --git a/Godeps/_workspace/src/github.com/syndtr/goleveldb/leveldb/storage/storage.go b/Godeps/_workspace/src/github.com/syndtr/goleveldb/leveldb/storage/storage.go
index bd6fdd58d5aa65202617da81914170006b155f9e..85dd70b06f9f6c8955d60b382d4a8652b1ba1292 100644
--- a/Godeps/_workspace/src/github.com/syndtr/goleveldb/leveldb/storage/storage.go
+++ b/Godeps/_workspace/src/github.com/syndtr/goleveldb/leveldb/storage/storage.go
@@ -12,7 +12,7 @@ import (
 	"fmt"
 	"io"
 
-	"github.comsyndtr/goleveldb/leveldb/util"
+	"github.com/syndtr/goleveldb/leveldb/util"
 )
 
 type FileType uint32
diff --git a/Godeps/_workspace/src/github.com/syndtr/goleveldb/leveldb/storage_test.go b/Godeps/_workspace/src/github.com/syndtr/goleveldb/leveldb/storage_test.go
index ff8b3284b04c2abe3a28506441a6cda58a1b6600..08be0bab3da3b28e9c889c50ef813f6c0603d29b 100644
--- a/Godeps/_workspace/src/github.com/syndtr/goleveldb/leveldb/storage_test.go
+++ b/Godeps/_workspace/src/github.com/syndtr/goleveldb/leveldb/storage_test.go
@@ -17,8 +17,8 @@ import (
 	"sync"
 	"testing"
 
-	"github.comsyndtr/goleveldb/leveldb/storage"
-	"github.comsyndtr/goleveldb/leveldb/util"
+	"github.com/syndtr/goleveldb/leveldb/storage"
+	"github.com/syndtr/goleveldb/leveldb/util"
 )
 
 const typeShift = 4
diff --git a/Godeps/_workspace/src/github.com/syndtr/goleveldb/leveldb/table.go b/Godeps/_workspace/src/github.com/syndtr/goleveldb/leveldb/table.go
index 1b574996f5621f1c50d096357055c3beddcedfa2..db386f3b5465b68faff4b7f709482bdfdb830b6f 100644
--- a/Godeps/_workspace/src/github.com/syndtr/goleveldb/leveldb/table.go
+++ b/Godeps/_workspace/src/github.com/syndtr/goleveldb/leveldb/table.go
@@ -11,12 +11,12 @@ import (
 	"sort"
 	"sync/atomic"
 
-	"github.comsyndtr/goleveldb/leveldb/cache"
-	"github.comsyndtr/goleveldb/leveldb/iterator"
-	"github.comsyndtr/goleveldb/leveldb/opt"
-	"github.comsyndtr/goleveldb/leveldb/storage"
-	"github.comsyndtr/goleveldb/leveldb/table"
-	"github.comsyndtr/goleveldb/leveldb/util"
+	"github.com/syndtr/goleveldb/leveldb/cache"
+	"github.com/syndtr/goleveldb/leveldb/iterator"
+	"github.com/syndtr/goleveldb/leveldb/opt"
+	"github.com/syndtr/goleveldb/leveldb/storage"
+	"github.com/syndtr/goleveldb/leveldb/table"
+	"github.com/syndtr/goleveldb/leveldb/util"
 )
 
 // tFile holds basic information about a table.
diff --git a/Godeps/_workspace/src/github.com/syndtr/goleveldb/leveldb/table/block_test.go b/Godeps/_workspace/src/github.com/syndtr/goleveldb/leveldb/table/block_test.go
index dde788e57922823427c254af6ea1ca1d1b00cb2b..00e6f9eea0dd97ae892eab1934d4f096f73a1b65 100644
--- a/Godeps/_workspace/src/github.com/syndtr/goleveldb/leveldb/table/block_test.go
+++ b/Godeps/_workspace/src/github.com/syndtr/goleveldb/leveldb/table/block_test.go
@@ -13,10 +13,10 @@ import (
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
 
-	"github.comsyndtr/goleveldb/leveldb/comparer"
-	"github.comsyndtr/goleveldb/leveldb/iterator"
-	"github.comsyndtr/goleveldb/leveldb/testutil"
-	"github.comsyndtr/goleveldb/leveldb/util"
+	"github.com/syndtr/goleveldb/leveldb/comparer"
+	"github.com/syndtr/goleveldb/leveldb/iterator"
+	"github.com/syndtr/goleveldb/leveldb/testutil"
+	"github.com/syndtr/goleveldb/leveldb/util"
 )
 
 type blockTesting struct {
diff --git a/Godeps/_workspace/src/github.com/syndtr/goleveldb/leveldb/table/reader.go b/Godeps/_workspace/src/github.com/syndtr/goleveldb/leveldb/table/reader.go
index 8d10aba2160f3e91e1b6f0a2f498c4616d0be2cd..691ffc2aa8118f7e5c864853d34580ddbbf9b9aa 100644
--- a/Godeps/_workspace/src/github.com/syndtr/goleveldb/leveldb/table/reader.go
+++ b/Godeps/_workspace/src/github.com/syndtr/goleveldb/leveldb/table/reader.go
@@ -16,14 +16,14 @@ import (
 
 	"github.comgoogle/go-snappy/snappy"
 
-	"github.comsyndtr/goleveldb/leveldb/cache"
-	"github.comsyndtr/goleveldb/leveldb/comparer"
-	"github.comsyndtr/goleveldb/leveldb/errors"
-	"github.comsyndtr/goleveldb/leveldb/filter"
-	"github.comsyndtr/goleveldb/leveldb/iterator"
-	"github.comsyndtr/goleveldb/leveldb/opt"
-	"github.comsyndtr/goleveldb/leveldb/storage"
-	"github.comsyndtr/goleveldb/leveldb/util"
+	"github.com/syndtr/goleveldb/leveldb/cache"
+	"github.com/syndtr/goleveldb/leveldb/comparer"
+	"github.com/syndtr/goleveldb/leveldb/errors"
+	"github.com/syndtr/goleveldb/leveldb/filter"
+	"github.com/syndtr/goleveldb/leveldb/iterator"
+	"github.com/syndtr/goleveldb/leveldb/opt"
+	"github.com/syndtr/goleveldb/leveldb/storage"
+	"github.com/syndtr/goleveldb/leveldb/util"
 )
 
 var (
diff --git a/Godeps/_workspace/src/github.com/syndtr/goleveldb/leveldb/table/table_suite_test.go b/Godeps/_workspace/src/github.com/syndtr/goleveldb/leveldb/table/table_suite_test.go
index 088a4847a84355f10f75f36cad19352c4adf647f..6465da6e3707c48ab28ebc176c33b80b66c0c8b3 100644
--- a/Godeps/_workspace/src/github.com/syndtr/goleveldb/leveldb/table/table_suite_test.go
+++ b/Godeps/_workspace/src/github.com/syndtr/goleveldb/leveldb/table/table_suite_test.go
@@ -3,7 +3,7 @@ package table
 import (
 	"testing"
 
-	"github.comsyndtr/goleveldb/leveldb/testutil"
+	"github.com/syndtr/goleveldb/leveldb/testutil"
 )
 
 func TestTable(t *testing.T) {
diff --git a/Godeps/_workspace/src/github.com/syndtr/goleveldb/leveldb/table/table_test.go b/Godeps/_workspace/src/github.com/syndtr/goleveldb/leveldb/table/table_test.go
index 4772588b9d33ff77d722412db3dd07ea0ff2d0aa..4b59b31f52b42f12e8e098ea3a20d3b10d6b334e 100644
--- a/Godeps/_workspace/src/github.com/syndtr/goleveldb/leveldb/table/table_test.go
+++ b/Godeps/_workspace/src/github.com/syndtr/goleveldb/leveldb/table/table_test.go
@@ -12,10 +12,10 @@ import (
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
 
-	"github.comsyndtr/goleveldb/leveldb/iterator"
-	"github.comsyndtr/goleveldb/leveldb/opt"
-	"github.comsyndtr/goleveldb/leveldb/testutil"
-	"github.comsyndtr/goleveldb/leveldb/util"
+	"github.com/syndtr/goleveldb/leveldb/iterator"
+	"github.com/syndtr/goleveldb/leveldb/opt"
+	"github.com/syndtr/goleveldb/leveldb/testutil"
+	"github.com/syndtr/goleveldb/leveldb/util"
 )
 
 type tableWrapper struct {
diff --git a/Godeps/_workspace/src/github.com/syndtr/goleveldb/leveldb/table/writer.go b/Godeps/_workspace/src/github.com/syndtr/goleveldb/leveldb/table/writer.go
index ceff87d51d747be1cefe78f4dc29e629f6dcc8dd..42285b5f29e98be0f40528bae2625e26d8fe1648 100644
--- a/Godeps/_workspace/src/github.com/syndtr/goleveldb/leveldb/table/writer.go
+++ b/Godeps/_workspace/src/github.com/syndtr/goleveldb/leveldb/table/writer.go
@@ -14,10 +14,10 @@ import (
 
 	"github.comgoogle/go-snappy/snappy"
 
-	"github.comsyndtr/goleveldb/leveldb/comparer"
-	"github.comsyndtr/goleveldb/leveldb/filter"
-	"github.comsyndtr/goleveldb/leveldb/opt"
-	"github.comsyndtr/goleveldb/leveldb/util"
+	"github.com/syndtr/goleveldb/leveldb/comparer"
+	"github.com/syndtr/goleveldb/leveldb/filter"
+	"github.com/syndtr/goleveldb/leveldb/opt"
+	"github.com/syndtr/goleveldb/leveldb/util"
 )
 
 func sharedPrefixLen(a, b []byte) int {
diff --git a/Godeps/_workspace/src/github.com/syndtr/goleveldb/leveldb/testutil/db.go b/Godeps/_workspace/src/github.com/syndtr/goleveldb/leveldb/testutil/db.go
index cc9a5611b62b11ec850a64b863230d0d8e1c0ab3..ec3f177a12febb5259fb9d88a5b8b58e7d37dca7 100644
--- a/Godeps/_workspace/src/github.com/syndtr/goleveldb/leveldb/testutil/db.go
+++ b/Godeps/_workspace/src/github.com/syndtr/goleveldb/leveldb/testutil/db.go
@@ -12,9 +12,9 @@ import (
 
 	. "github.com/onsi/gomega"
 
-	"github.comsyndtr/goleveldb/leveldb/errors"
-	"github.comsyndtr/goleveldb/leveldb/iterator"
-	"github.comsyndtr/goleveldb/leveldb/util"
+	"github.com/syndtr/goleveldb/leveldb/errors"
+	"github.com/syndtr/goleveldb/leveldb/iterator"
+	"github.com/syndtr/goleveldb/leveldb/util"
 )
 
 type DB interface{}
diff --git a/Godeps/_workspace/src/github.com/syndtr/goleveldb/leveldb/testutil/iter.go b/Godeps/_workspace/src/github.com/syndtr/goleveldb/leveldb/testutil/iter.go
index 02e0a674e63a99cb351a5b879fe5f3b81150333b..df6d9db6a335bf388ba844ee0af918707e9caf34 100644
--- a/Godeps/_workspace/src/github.com/syndtr/goleveldb/leveldb/testutil/iter.go
+++ b/Godeps/_workspace/src/github.com/syndtr/goleveldb/leveldb/testutil/iter.go
@@ -12,7 +12,7 @@ import (
 
 	. "github.com/onsi/gomega"
 
-	"github.comsyndtr/goleveldb/leveldb/iterator"
+	"github.com/syndtr/goleveldb/leveldb/iterator"
 )
 
 type IterAct int
diff --git a/Godeps/_workspace/src/github.com/syndtr/goleveldb/leveldb/testutil/kv.go b/Godeps/_workspace/src/github.com/syndtr/goleveldb/leveldb/testutil/kv.go
index 1a3e871182a26bfc47b7846783dad0a15dc2f356..471d5708c37d826d7c5e75139f209c816b13f7c5 100644
--- a/Godeps/_workspace/src/github.com/syndtr/goleveldb/leveldb/testutil/kv.go
+++ b/Godeps/_workspace/src/github.com/syndtr/goleveldb/leveldb/testutil/kv.go
@@ -12,7 +12,7 @@ import (
 	"sort"
 	"strings"
 
-	"github.comsyndtr/goleveldb/leveldb/util"
+	"github.com/syndtr/goleveldb/leveldb/util"
 )
 
 type KeyValueEntry struct {
diff --git a/Godeps/_workspace/src/github.com/syndtr/goleveldb/leveldb/testutil/kvtest.go b/Godeps/_workspace/src/github.com/syndtr/goleveldb/leveldb/testutil/kvtest.go
index 76fac418337787f4a15e69e778d6d6a907f6b4b5..a0b58f0e7252b632651a6480f32fc47e973cca01 100644
--- a/Godeps/_workspace/src/github.com/syndtr/goleveldb/leveldb/testutil/kvtest.go
+++ b/Godeps/_workspace/src/github.com/syndtr/goleveldb/leveldb/testutil/kvtest.go
@@ -13,8 +13,8 @@ import (
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
 
-	"github.comsyndtr/goleveldb/leveldb/errors"
-	"github.comsyndtr/goleveldb/leveldb/util"
+	"github.com/syndtr/goleveldb/leveldb/errors"
+	"github.com/syndtr/goleveldb/leveldb/util"
 )
 
 func KeyValueTesting(rnd *rand.Rand, kv KeyValue, p DB, setup func(KeyValue) DB, teardown func(DB)) {
diff --git a/Godeps/_workspace/src/github.com/syndtr/goleveldb/leveldb/testutil/storage.go b/Godeps/_workspace/src/github.com/syndtr/goleveldb/leveldb/testutil/storage.go
index 46a379f1f32b04c6c3e4bff5d658e4fc72cda2fb..59c496d54c62e90afe4cd057d81f412b10edef6b 100644
--- a/Godeps/_workspace/src/github.com/syndtr/goleveldb/leveldb/testutil/storage.go
+++ b/Godeps/_workspace/src/github.com/syndtr/goleveldb/leveldb/testutil/storage.go
@@ -18,8 +18,8 @@ import (
 
 	. "github.com/onsi/gomega"
 
-	"github.comsyndtr/goleveldb/leveldb/storage"
-	"github.comsyndtr/goleveldb/leveldb/util"
+	"github.com/syndtr/goleveldb/leveldb/storage"
+	"github.com/syndtr/goleveldb/leveldb/util"
 )
 
 var (
diff --git a/Godeps/_workspace/src/github.com/syndtr/goleveldb/leveldb/testutil/util.go b/Godeps/_workspace/src/github.com/syndtr/goleveldb/leveldb/testutil/util.go
index 7a82afd7240ed0ed8ca79eab405a46926cdfa79f..97c5294b1b5dd0c16162cd49fb55ad27274cb89a 100644
--- a/Godeps/_workspace/src/github.com/syndtr/goleveldb/leveldb/testutil/util.go
+++ b/Godeps/_workspace/src/github.com/syndtr/goleveldb/leveldb/testutil/util.go
@@ -15,7 +15,7 @@ import (
 
 	"github.com/onsi/ginkgo/config"
 
-	"github.comsyndtr/goleveldb/leveldb/comparer"
+	"github.com/syndtr/goleveldb/leveldb/comparer"
 )
 
 var (
diff --git a/Godeps/_workspace/src/github.com/syndtr/goleveldb/leveldb/testutil_test.go b/Godeps/_workspace/src/github.com/syndtr/goleveldb/leveldb/testutil_test.go
index 51a171a5bffe95a9102a5e3693c4ef19a99d8402..25bf2b29f99310e6af6ab1532ccfc9cdf1621e87 100644
--- a/Godeps/_workspace/src/github.com/syndtr/goleveldb/leveldb/testutil_test.go
+++ b/Godeps/_workspace/src/github.com/syndtr/goleveldb/leveldb/testutil_test.go
@@ -9,10 +9,10 @@ package leveldb
 import (
 	. "github.com/onsi/gomega"
 
-	"github.comsyndtr/goleveldb/leveldb/iterator"
-	"github.comsyndtr/goleveldb/leveldb/opt"
-	"github.comsyndtr/goleveldb/leveldb/testutil"
-	"github.comsyndtr/goleveldb/leveldb/util"
+	"github.com/syndtr/goleveldb/leveldb/iterator"
+	"github.com/syndtr/goleveldb/leveldb/opt"
+	"github.com/syndtr/goleveldb/leveldb/testutil"
+	"github.com/syndtr/goleveldb/leveldb/util"
 )
 
 type testingDB struct {
diff --git a/Godeps/_workspace/src/github.com/syndtr/goleveldb/leveldb/util.go b/Godeps/_workspace/src/github.com/syndtr/goleveldb/leveldb/util.go
index 0c8c93c3430a27af33f76055f8e3919d03f598ae..1a5bf71a3254044964beba9aee5362e5da1ed763 100644
--- a/Godeps/_workspace/src/github.com/syndtr/goleveldb/leveldb/util.go
+++ b/Godeps/_workspace/src/github.com/syndtr/goleveldb/leveldb/util.go
@@ -10,7 +10,7 @@ import (
 	"fmt"
 	"sort"
 
-	"github.comsyndtr/goleveldb/leveldb/storage"
+	"github.com/syndtr/goleveldb/leveldb/storage"
 )
 
 func shorten(str string) string {
diff --git a/Godeps/_workspace/src/github.com/syndtr/goleveldb/leveldb/version.go b/Godeps/_workspace/src/github.com/syndtr/goleveldb/leveldb/version.go
index d259f61fbd3796f0c54968517eac7bac36cd185e..011d982da82c13eaf18b9b2abb9c106f2c4a012e 100644
--- a/Godeps/_workspace/src/github.com/syndtr/goleveldb/leveldb/version.go
+++ b/Godeps/_workspace/src/github.com/syndtr/goleveldb/leveldb/version.go
@@ -10,9 +10,9 @@ import (
 	"sync/atomic"
 	"unsafe"
 
-	"github.comsyndtr/goleveldb/leveldb/iterator"
-	"github.comsyndtr/goleveldb/leveldb/opt"
-	"github.comsyndtr/goleveldb/leveldb/util"
+	"github.com/syndtr/goleveldb/leveldb/iterator"
+	"github.com/syndtr/goleveldb/leveldb/opt"
+	"github.com/syndtr/goleveldb/leveldb/util"
 )
 
 type tSet struct {
diff --git a/Godeps/_workspace/src/github.com/tendermint/ed25519/ed25519.go b/Godeps/_workspace/src/github.com/tendermint/ed25519/ed25519.go
index bcee7d9bd6c53ff9a4a549469fa594e6689440ac..48ac4a423ec0452caf979154573e15485834a25a 100644
--- a/Godeps/_workspace/src/github.com/tendermint/ed25519/ed25519.go
+++ b/Godeps/_workspace/src/github.com/tendermint/ed25519/ed25519.go
@@ -14,7 +14,7 @@ import (
 	"crypto/subtle"
 	"io"
 
-	"github.comagl/ed25519/edwards25519"
+	"github.com/agl/ed25519/edwards25519"
 )
 
 const (
diff --git a/Godeps/_workspace/src/github.com/tendermint/ed25519/extra25519/extra25519.go b/Godeps/_workspace/src/github.com/tendermint/ed25519/extra25519/extra25519.go
index 61767e4e4c687f9adb5142cf59f415f6886ef8ca..571218f5516f5f679364e57cb3db1fcbf3fb3225 100644
--- a/Godeps/_workspace/src/github.com/tendermint/ed25519/extra25519/extra25519.go
+++ b/Godeps/_workspace/src/github.com/tendermint/ed25519/extra25519/extra25519.go
@@ -7,7 +7,7 @@ package extra25519
 import (
 	"crypto/sha512"
 
-	"github.comagl/ed25519/edwards25519"
+	"github.com/agl/ed25519/edwards25519"
 )
 
 // PrivateKeyToCurve25519 converts an ed25519 private key into a corresponding
diff --git a/Godeps/_workspace/src/github.com/tendermint/log15/handler.go b/Godeps/_workspace/src/github.com/tendermint/log15/handler.go
index 3307e9c30eaf472e95aac29b3ae07e806beccedd..4c771b4ba65c25eddec2741d29863af9cb17222b 100644
--- a/Godeps/_workspace/src/github.com/tendermint/log15/handler.go
+++ b/Godeps/_workspace/src/github.com/tendermint/log15/handler.go
@@ -11,7 +11,7 @@ import (
 	"sync/atomic"
 	"unsafe"
 
-	"github.cominconshreveable/log15/stack"
+	"github.com/inconshreveable/log15/stack"
 )
 
 // A Logger prints its log records by writing to a Handler.
diff --git a/Godeps/_workspace/src/github.com/tendermint/log15/root.go b/Godeps/_workspace/src/github.com/tendermint/log15/root.go
index d87b0e9e5bbffeb1bbf48dbef1b97c246f3edf9e..98103173063315850752f8c4752b70d09799325b 100644
--- a/Godeps/_workspace/src/github.com/tendermint/log15/root.go
+++ b/Godeps/_workspace/src/github.com/tendermint/log15/root.go
@@ -3,8 +3,8 @@ package log15
 import (
 	"os"
 
-	"github.cominconshreveable/log15/term"
-	"github.commattn/go-colorable"
+	"github.com/inconshreveable/log15/term"
+	"github.com/mattn/go-colorable"
 )
 
 var (
diff --git a/Godeps/_workspace/src/github.com/tendermint/log15/stack/stack_test.go b/Godeps/_workspace/src/github.com/tendermint/log15/stack/stack_test.go
index 7d6f7949c174b8e690300e76b3ab319059834c0c..52371b1e45ab1ac08469a56607133e18cc6716d5 100644
--- a/Godeps/_workspace/src/github.com/tendermint/log15/stack/stack_test.go
+++ b/Godeps/_workspace/src/github.com/tendermint/log15/stack/stack_test.go
@@ -9,7 +9,7 @@ import (
 	"runtime"
 	"testing"
 
-	"github.cominconshreveable/log15/stack"
+	"github.com/inconshreveable/log15/stack"
 )
 
 type testType struct{}
diff --git a/Godeps/_workspace/src/github.com/tendermint/tendermint/account/account.go b/Godeps/_workspace/src/github.com/tendermint/tendermint/account/account.go
index 9be275dbcbc2dd2895074b44496af4dac6efcaa6..d69be6e76984c195a6c235fc515cbf700614909b 100644
--- a/Godeps/_workspace/src/github.com/tendermint/tendermint/account/account.go
+++ b/Godeps/_workspace/src/github.com/tendermint/tendermint/account/account.go
@@ -5,10 +5,10 @@ import (
 	"fmt"
 	"io"
 
-	. "github.com/tendermint/tendermint/common"
-	"github.com/tendermint/tendermint/merkle"
-	ptypes "github.com/tendermint/tendermint/permission/types"
-	"github.com/tendermint/tendermint/wire"
+	. "github.com/eris-ltd/eris-db/Godeps/_workspace/src/github.com/tendermint/tendermint/common"
+	"github.com/eris-ltd/eris-db/Godeps/_workspace/src/github.com/tendermint/tendermint/merkle"
+	ptypes "github.com/eris-ltd/eris-db/Godeps/_workspace/src/github.com/tendermint/tendermint/permission/types"
+	"github.com/eris-ltd/eris-db/Godeps/_workspace/src/github.com/tendermint/tendermint/wire"
 )
 
 // Signable is an interface for all signable things.
diff --git a/Godeps/_workspace/src/github.com/tendermint/tendermint/account/priv_account.go b/Godeps/_workspace/src/github.com/tendermint/tendermint/account/priv_account.go
index e119fc56a965de9e8b83f851b07fab6317e4f27f..0d37711bb35dc596281c96a1ad1e06ba85638d91 100644
--- a/Godeps/_workspace/src/github.com/tendermint/tendermint/account/priv_account.go
+++ b/Godeps/_workspace/src/github.com/tendermint/tendermint/account/priv_account.go
@@ -1,9 +1,9 @@
 package account
 
 import (
-	"github.com/tendermint/ed25519"
-	. "github.com/tendermint/tendermint/common"
-	"github.com/tendermint/tendermint/wire"
+	"github.com/eris-ltd/eris-db/Godeps/_workspace/src/github.com/tendermint/ed25519"
+	. "github.com/eris-ltd/eris-db/Godeps/_workspace/src/github.com/tendermint/tendermint/common"
+	"github.com/eris-ltd/eris-db/Godeps/_workspace/src/github.com/tendermint/tendermint/wire"
 )
 
 type PrivAccount struct {
diff --git a/Godeps/_workspace/src/github.com/tendermint/tendermint/account/priv_key.go b/Godeps/_workspace/src/github.com/tendermint/tendermint/account/priv_key.go
index 5245a2d62cdc56b0eb9f63c3cdaf6f3cee40b7a8..3597060b52e15e9035807660e4cc2c6275e2125e 100644
--- a/Godeps/_workspace/src/github.com/tendermint/tendermint/account/priv_key.go
+++ b/Godeps/_workspace/src/github.com/tendermint/tendermint/account/priv_key.go
@@ -1,10 +1,10 @@
 package account
 
 import (
-	"github.com/tendermint/ed25519"
-	"github.com/tendermint/ed25519/extra25519"
-	. "github.com/tendermint/tendermint/common"
-	"github.com/tendermint/tendermint/wire"
+	"github.com/eris-ltd/eris-db/Godeps/_workspace/src/github.com/tendermint/ed25519"
+	"github.com/eris-ltd/eris-db/Godeps/_workspace/src/github.com/tendermint/ed25519/extra25519"
+	. "github.com/eris-ltd/eris-db/Godeps/_workspace/src/github.com/tendermint/tendermint/common"
+	"github.com/eris-ltd/eris-db/Godeps/_workspace/src/github.com/tendermint/tendermint/wire"
 )
 
 // PrivKey is part of PrivAccount and state.PrivValidator.
diff --git a/Godeps/_workspace/src/github.com/tendermint/tendermint/account/pub_key.go b/Godeps/_workspace/src/github.com/tendermint/tendermint/account/pub_key.go
index 4451950c49991cce747916ba70f958152274428e..c4bdc328946efd2923b1562dd18f1e4df94b8f9f 100644
--- a/Godeps/_workspace/src/github.com/tendermint/tendermint/account/pub_key.go
+++ b/Godeps/_workspace/src/github.com/tendermint/tendermint/account/pub_key.go
@@ -3,10 +3,10 @@ package account
 import (
 	"bytes"
 
-	"github.com/tendermint/ed25519"
-	"github.com/tendermint/ed25519/extra25519"
-	. "github.com/tendermint/tendermint/common"
-	"github.com/tendermint/tendermint/wire"
+	"github.com/eris-ltd/eris-db/Godeps/_workspace/src/github.com/tendermint/ed25519"
+	"github.com/eris-ltd/eris-db/Godeps/_workspace/src/github.com/tendermint/ed25519/extra25519"
+	. "github.com/eris-ltd/eris-db/Godeps/_workspace/src/github.com/tendermint/tendermint/common"
+	"github.com/eris-ltd/eris-db/Godeps/_workspace/src/github.com/tendermint/tendermint/wire"
 	"github.com/eris-ltd/eris-db/Godeps/_workspace/src/golang.org/x/crypto/ripemd160"
 )
 
diff --git a/Godeps/_workspace/src/github.com/tendermint/tendermint/account/signature.go b/Godeps/_workspace/src/github.com/tendermint/tendermint/account/signature.go
index 32dc86687cc060a309d2b34266a89639050d3924..2c0b816cddfdb4f84ba1547f92721af49dec9a1f 100644
--- a/Godeps/_workspace/src/github.com/tendermint/tendermint/account/signature.go
+++ b/Godeps/_workspace/src/github.com/tendermint/tendermint/account/signature.go
@@ -3,8 +3,8 @@ package account
 import (
 	"fmt"
 
-	. "github.com/tendermint/tendermint/common"
-	"github.com/tendermint/tendermint/wire"
+	. "github.com/eris-ltd/eris-db/Godeps/_workspace/src/github.com/tendermint/tendermint/common"
+	"github.com/eris-ltd/eris-db/Godeps/_workspace/src/github.com/tendermint/tendermint/wire"
 )
 
 // Signature is a part of Txs and consensus Votes.
diff --git a/Godeps/_workspace/src/github.com/tendermint/tendermint/account/signature_test.go b/Godeps/_workspace/src/github.com/tendermint/tendermint/account/signature_test.go
index 1d22cc69c60317bcbd5697ccc722867d1556ccb7..8c08dde865c652c0949d6c673510193e464a36d6 100644
--- a/Godeps/_workspace/src/github.com/tendermint/tendermint/account/signature_test.go
+++ b/Godeps/_workspace/src/github.com/tendermint/tendermint/account/signature_test.go
@@ -4,9 +4,9 @@ import (
 	"bytes"
 	"testing"
 
-	"github.com/tendermint/ed25519"
-	. "github.com/tendermint/tendermint/common"
-	"github.com/tendermint/tendermint/wire"
+	"github.com/eris-ltd/eris-db/Godeps/_workspace/src/github.com/tendermint/ed25519"
+	. "github.com/eris-ltd/eris-db/Godeps/_workspace/src/github.com/tendermint/tendermint/common"
+	"github.com/eris-ltd/eris-db/Godeps/_workspace/src/github.com/tendermint/tendermint/wire"
 )
 
 func TestSignAndValidate(t *testing.T) {
diff --git a/Godeps/_workspace/src/github.com/tendermint/tendermint/alert/alert.go b/Godeps/_workspace/src/github.com/tendermint/tendermint/alert/alert.go
index 78554281ee1f87f708c8e38fb0fb8ec45f7d3535..c47633091d786c9c51ed40861ce8b890de856de0 100644
--- a/Godeps/_workspace/src/github.com/tendermint/tendermint/alert/alert.go
+++ b/Godeps/_workspace/src/github.com/tendermint/tendermint/alert/alert.go
@@ -4,7 +4,7 @@ import (
 	"fmt"
 	"time"
 
-	"github.comsfreiberg/gotwilio"
+	"github.com/sfreiberg/gotwilio"
 )
 
 var lastAlertUnix int64 = 0
diff --git a/Godeps/_workspace/src/github.com/tendermint/tendermint/alert/config.go b/Godeps/_workspace/src/github.com/tendermint/tendermint/alert/config.go
index 834803facf27aded5a96a460e8279212375a4ba4..2354e5617adec9dc143745cf456148fbe81c5528 100644
--- a/Godeps/_workspace/src/github.com/tendermint/tendermint/alert/config.go
+++ b/Godeps/_workspace/src/github.com/tendermint/tendermint/alert/config.go
@@ -1,7 +1,7 @@
 package alert
 
 import (
-	cfg "github.com/tendermint/tendermint/config"
+	cfg "github.com/eris-ltd/eris-db/Godeps/_workspace/src/github.com/tendermint/tendermint/config"
 )
 
 var config cfg.Config = nil
diff --git a/Godeps/_workspace/src/github.com/tendermint/tendermint/alert/log.go b/Godeps/_workspace/src/github.com/tendermint/tendermint/alert/log.go
index 0f0740e0c17ea42f74516a8c3592b2579804220b..9fccbd85accab8da8660a1e8bf2064db2c2cddf8 100644
--- a/Godeps/_workspace/src/github.com/tendermint/tendermint/alert/log.go
+++ b/Godeps/_workspace/src/github.com/tendermint/tendermint/alert/log.go
@@ -1,7 +1,7 @@
 package alert
 
 import (
-	"github.com/tendermint/tendermint/logger"
+	"github.com/eris-ltd/eris-db/Godeps/_workspace/src/github.com/tendermint/tendermint/logger"
 )
 
 var log = logger.New("module", "alert")
diff --git a/Godeps/_workspace/src/github.com/tendermint/tendermint/blockchain/log.go b/Godeps/_workspace/src/github.com/tendermint/tendermint/blockchain/log.go
index f04e99943b32c12669112eb74f7ba031774b9889..68783ee2d7fc9ceb5f924de601a78292d45192e9 100644
--- a/Godeps/_workspace/src/github.com/tendermint/tendermint/blockchain/log.go
+++ b/Godeps/_workspace/src/github.com/tendermint/tendermint/blockchain/log.go
@@ -1,7 +1,7 @@
 package blockchain
 
 import (
-	"github.com/tendermint/tendermint/logger"
+	"github.com/eris-ltd/eris-db/Godeps/_workspace/src/github.com/tendermint/tendermint/logger"
 )
 
 var log = logger.New("module", "blockchain")
diff --git a/Godeps/_workspace/src/github.com/tendermint/tendermint/blockchain/pool.go b/Godeps/_workspace/src/github.com/tendermint/tendermint/blockchain/pool.go
index fd31222eeb8bd99bc699442ed09df6590cb6b274..66be4dc820cd983b702ddd6349473fd8a5192c76 100644
--- a/Godeps/_workspace/src/github.com/tendermint/tendermint/blockchain/pool.go
+++ b/Godeps/_workspace/src/github.com/tendermint/tendermint/blockchain/pool.go
@@ -6,8 +6,8 @@ import (
 	"time"
 
 	flow "github.com/eris-ltd/eris-db/Godeps/_workspace/src/code.google.com/p/mxk/go1/flowcontrol"
-	. "github.com/tendermint/tendermint/common"
-	"github.com/tendermint/tendermint/types"
+	. "github.com/eris-ltd/eris-db/Godeps/_workspace/src/github.com/tendermint/tendermint/common"
+	"github.com/eris-ltd/eris-db/Godeps/_workspace/src/github.com/tendermint/tendermint/types"
 )
 
 const (
diff --git a/Godeps/_workspace/src/github.com/tendermint/tendermint/blockchain/pool_test.go b/Godeps/_workspace/src/github.com/tendermint/tendermint/blockchain/pool_test.go
index a70c96d58eaa811b0d84ef9e684207e771a7d73e..50a55b43248dc8cf49edfd90b3be6fc1098706a1 100644
--- a/Godeps/_workspace/src/github.com/tendermint/tendermint/blockchain/pool_test.go
+++ b/Godeps/_workspace/src/github.com/tendermint/tendermint/blockchain/pool_test.go
@@ -5,8 +5,8 @@ import (
 	"testing"
 	"time"
 
-	. "github.com/tendermint/tendermint/common"
-	"github.com/tendermint/tendermint/types"
+	. "github.com/eris-ltd/eris-db/Godeps/_workspace/src/github.com/tendermint/tendermint/common"
+	"github.com/eris-ltd/eris-db/Godeps/_workspace/src/github.com/tendermint/tendermint/types"
 )
 
 type testPeer struct {
diff --git a/Godeps/_workspace/src/github.com/tendermint/tendermint/blockchain/reactor.go b/Godeps/_workspace/src/github.com/tendermint/tendermint/blockchain/reactor.go
index b80438a7255e5d2d53f3e3a5317e495abb2031ea..bd50d5a679588550e537f29b1f174fe6089831db 100644
--- a/Godeps/_workspace/src/github.com/tendermint/tendermint/blockchain/reactor.go
+++ b/Godeps/_workspace/src/github.com/tendermint/tendermint/blockchain/reactor.go
@@ -7,12 +7,12 @@ import (
 	"reflect"
 	"time"
 
-	. "github.com/tendermint/tendermint/common"
-	"github.com/tendermint/tendermint/events"
-	"github.com/tendermint/tendermint/p2p"
-	sm "github.com/tendermint/tendermint/state"
-	"github.com/tendermint/tendermint/types"
-	"github.com/tendermint/tendermint/wire"
+	. "github.com/eris-ltd/eris-db/Godeps/_workspace/src/github.com/tendermint/tendermint/common"
+	"github.com/eris-ltd/eris-db/Godeps/_workspace/src/github.com/tendermint/tendermint/events"
+	"github.com/eris-ltd/eris-db/Godeps/_workspace/src/github.com/tendermint/tendermint/p2p"
+	sm "github.com/eris-ltd/eris-db/Godeps/_workspace/src/github.com/tendermint/tendermint/state"
+	"github.com/eris-ltd/eris-db/Godeps/_workspace/src/github.com/tendermint/tendermint/types"
+	"github.com/eris-ltd/eris-db/Godeps/_workspace/src/github.com/tendermint/tendermint/wire"
 )
 
 const (
diff --git a/Godeps/_workspace/src/github.com/tendermint/tendermint/blockchain/store.go b/Godeps/_workspace/src/github.com/tendermint/tendermint/blockchain/store.go
index 69a499291bd58c1a46590a855eaf1e7e9ee31c08..d56b606d70964433de5a1f15ca66ecbcfb9e1584 100644
--- a/Godeps/_workspace/src/github.com/tendermint/tendermint/blockchain/store.go
+++ b/Godeps/_workspace/src/github.com/tendermint/tendermint/blockchain/store.go
@@ -6,10 +6,10 @@ import (
 	"fmt"
 	"io"
 
-	. "github.com/tendermint/tendermint/common"
-	dbm "github.com/tendermint/tendermint/db"
-	"github.com/tendermint/tendermint/types"
-	"github.com/tendermint/tendermint/wire"
+	. "github.com/eris-ltd/eris-db/Godeps/_workspace/src/github.com/tendermint/tendermint/common"
+	dbm "github.com/eris-ltd/eris-db/Godeps/_workspace/src/github.com/tendermint/tendermint/db"
+	"github.com/eris-ltd/eris-db/Godeps/_workspace/src/github.com/tendermint/tendermint/types"
+	"github.com/eris-ltd/eris-db/Godeps/_workspace/src/github.com/tendermint/tendermint/wire"
 )
 
 /*
diff --git a/Godeps/_workspace/src/github.com/tendermint/tendermint/common/service.go b/Godeps/_workspace/src/github.com/tendermint/tendermint/common/service.go
index 0c007f958e1773b05416095b01e2a22a48f2bc3a..e000b439411e05ba69421f2889c80b59d36fa0a2 100644
--- a/Godeps/_workspace/src/github.com/tendermint/tendermint/common/service.go
+++ b/Godeps/_workspace/src/github.com/tendermint/tendermint/common/service.go
@@ -39,7 +39,7 @@ func (fs *FooService) OnStop() error {
 package common
 
 import "sync/atomic"
-import "github.com/tendermint/log15"
+import "github.com/eris-ltd/eris-db/Godeps/_workspace/src/github.com/tendermint/log15"
 
 type Service interface {
 	Start() (bool, error)
diff --git a/Godeps/_workspace/src/github.com/tendermint/tendermint/common/test/mutate.go b/Godeps/_workspace/src/github.com/tendermint/tendermint/common/test/mutate.go
index 39bf9055705c31ffd0237d32ffe6d8c6022e2656..5931ae6a002627576add7d0ff09b2015a22dd449 100644
--- a/Godeps/_workspace/src/github.com/tendermint/tendermint/common/test/mutate.go
+++ b/Godeps/_workspace/src/github.com/tendermint/tendermint/common/test/mutate.go
@@ -1,7 +1,7 @@
 package test
 
 import (
-	. "github.com/tendermint/tendermint/common"
+	. "github.com/eris-ltd/eris-db/Godeps/_workspace/src/github.com/tendermint/tendermint/common"
 )
 
 // Contract: !bytes.Equal(input, output) && len(input) >= len(output)
diff --git a/Godeps/_workspace/src/github.com/tendermint/tendermint/config/log.go b/Godeps/_workspace/src/github.com/tendermint/tendermint/config/log.go
index 3cd8f430f03a59e723a675590650f913a553168d..8057015d1d6e47774d521a53d98226bf7cad7ee7 100644
--- a/Godeps/_workspace/src/github.com/tendermint/tendermint/config/log.go
+++ b/Godeps/_workspace/src/github.com/tendermint/tendermint/config/log.go
@@ -3,7 +3,7 @@ package config
 import (
 	// We can't use github.com/tendermint/tendermint/logger
 	// because that would create a dependency cycle.
-	"github.com/tendermint/log15"
+	"github.com/eris-ltd/eris-db/Godeps/_workspace/src/github.com/tendermint/log15"
 )
 
 var log = log15.New("module", "config")
diff --git a/Godeps/_workspace/src/github.com/tendermint/tendermint/config/tendermint/config.go b/Godeps/_workspace/src/github.com/tendermint/tendermint/config/tendermint/config.go
index a041128f6a5aad9d6e4fc98f49c858c4d52e9c1d..1a6b0225d78e20ab574f839f8acfc207723eec96 100644
--- a/Godeps/_workspace/src/github.com/tendermint/tendermint/config/tendermint/config.go
+++ b/Godeps/_workspace/src/github.com/tendermint/tendermint/config/tendermint/config.go
@@ -1,13 +1,13 @@
 package tendermint
 
 import (
-	"github.comnaoina/toml"
+	"github.com/naoina/toml"
 	"os"
 	"path"
 	"strings"
 
-	. "github.com/tendermint/tendermint/common"
-	cfg "github.com/tendermint/tendermint/config"
+	. "github.com/eris-ltd/eris-db/Godeps/_workspace/src/github.com/tendermint/tendermint/common"
+	cfg "github.com/eris-ltd/eris-db/Godeps/_workspace/src/github.com/tendermint/tendermint/config"
 )
 
 func getTMRoot(rootDir string) string {
diff --git a/Godeps/_workspace/src/github.com/tendermint/tendermint/config/tendermint_test/config.go b/Godeps/_workspace/src/github.com/tendermint/tendermint/config/tendermint_test/config.go
index 3313e7954c765018c6c4b6f2664a442583b04681..108d37a3f9ac8fd758fbcfc3ed14c374ef45c432 100644
--- a/Godeps/_workspace/src/github.com/tendermint/tendermint/config/tendermint_test/config.go
+++ b/Godeps/_workspace/src/github.com/tendermint/tendermint/config/tendermint_test/config.go
@@ -3,13 +3,13 @@
 package tendermint_test
 
 import (
-	"github.comnaoina/toml"
+	"github.com/naoina/toml"
 	"os"
 	"path"
 	"strings"
 
-	. "github.com/tendermint/tendermint/common"
-	cfg "github.com/tendermint/tendermint/config"
+	. "github.com/eris-ltd/eris-db/Godeps/_workspace/src/github.com/tendermint/tendermint/common"
+	cfg "github.com/eris-ltd/eris-db/Godeps/_workspace/src/github.com/tendermint/tendermint/config"
 )
 
 func init() {
diff --git a/Godeps/_workspace/src/github.com/tendermint/tendermint/consensus/config.go b/Godeps/_workspace/src/github.com/tendermint/tendermint/consensus/config.go
index 8366b36c5446c0039e01e0b787cc5e15d046a5a3..a9f0e602e3812fe9dd8315354bc68eddec41ccd0 100644
--- a/Godeps/_workspace/src/github.com/tendermint/tendermint/consensus/config.go
+++ b/Godeps/_workspace/src/github.com/tendermint/tendermint/consensus/config.go
@@ -1,7 +1,7 @@
 package consensus
 
 import (
-	cfg "github.com/tendermint/tendermint/config"
+	cfg "github.com/eris-ltd/eris-db/Godeps/_workspace/src/github.com/tendermint/tendermint/config"
 )
 
 var config cfg.Config = nil
diff --git a/Godeps/_workspace/src/github.com/tendermint/tendermint/consensus/height_vote_set.go b/Godeps/_workspace/src/github.com/tendermint/tendermint/consensus/height_vote_set.go
index eb680cd6e1ba34d8a7fd627b79e274c75259e540..37e6ad6231e09455bf597abd7d2f68b06881a7b2 100644
--- a/Godeps/_workspace/src/github.com/tendermint/tendermint/consensus/height_vote_set.go
+++ b/Godeps/_workspace/src/github.com/tendermint/tendermint/consensus/height_vote_set.go
@@ -4,8 +4,8 @@ import (
 	"strings"
 	"sync"
 
-	. "github.com/tendermint/tendermint/common"
-	"github.com/tendermint/tendermint/types"
+	. "github.com/eris-ltd/eris-db/Godeps/_workspace/src/github.com/tendermint/tendermint/common"
+	"github.com/eris-ltd/eris-db/Godeps/_workspace/src/github.com/tendermint/tendermint/types"
 )
 
 type RoundVoteSet struct {
diff --git a/Godeps/_workspace/src/github.com/tendermint/tendermint/consensus/log.go b/Godeps/_workspace/src/github.com/tendermint/tendermint/consensus/log.go
index 0b3a33dba281547b4145c820460dbfd5ff1a8318..12a5b9153d8d04bc5a6c7791ae65343be78670f5 100644
--- a/Godeps/_workspace/src/github.com/tendermint/tendermint/consensus/log.go
+++ b/Godeps/_workspace/src/github.com/tendermint/tendermint/consensus/log.go
@@ -1,7 +1,7 @@
 package consensus
 
 import (
-	"github.com/tendermint/tendermint/logger"
+	"github.com/eris-ltd/eris-db/Godeps/_workspace/src/github.com/tendermint/tendermint/logger"
 )
 
 var log = logger.New("module", "consensus")
diff --git a/Godeps/_workspace/src/github.com/tendermint/tendermint/consensus/reactor.go b/Godeps/_workspace/src/github.com/tendermint/tendermint/consensus/reactor.go
index dcf28e56b847357509782ecc66a860199e703d09..0b4378ee0fe4570c2a74a96d640df4d83a1a84ba 100644
--- a/Godeps/_workspace/src/github.com/tendermint/tendermint/consensus/reactor.go
+++ b/Godeps/_workspace/src/github.com/tendermint/tendermint/consensus/reactor.go
@@ -8,13 +8,13 @@ import (
 	"sync"
 	"time"
 
-	bc "github.com/tendermint/tendermint/blockchain"
-	. "github.com/tendermint/tendermint/common"
-	"github.com/tendermint/tendermint/events"
-	"github.com/tendermint/tendermint/p2p"
-	sm "github.com/tendermint/tendermint/state"
-	"github.com/tendermint/tendermint/types"
-	"github.com/tendermint/tendermint/wire"
+	bc "github.com/eris-ltd/eris-db/Godeps/_workspace/src/github.com/tendermint/tendermint/blockchain"
+	. "github.com/eris-ltd/eris-db/Godeps/_workspace/src/github.com/tendermint/tendermint/common"
+	"github.com/eris-ltd/eris-db/Godeps/_workspace/src/github.com/tendermint/tendermint/events"
+	"github.com/eris-ltd/eris-db/Godeps/_workspace/src/github.com/tendermint/tendermint/p2p"
+	sm "github.com/eris-ltd/eris-db/Godeps/_workspace/src/github.com/tendermint/tendermint/state"
+	"github.com/eris-ltd/eris-db/Godeps/_workspace/src/github.com/tendermint/tendermint/types"
+	"github.com/eris-ltd/eris-db/Godeps/_workspace/src/github.com/tendermint/tendermint/wire"
 )
 
 const (
diff --git a/Godeps/_workspace/src/github.com/tendermint/tendermint/consensus/state.go b/Godeps/_workspace/src/github.com/tendermint/tendermint/consensus/state.go
index 9c46a765683a522fb9f9de7284e9808ff857cd61..72ec17c6b4bb0df9a0e86900bc755e5f7d941f9c 100644
--- a/Godeps/_workspace/src/github.com/tendermint/tendermint/consensus/state.go
+++ b/Godeps/_workspace/src/github.com/tendermint/tendermint/consensus/state.go
@@ -157,14 +157,14 @@ import (
 	"sync"
 	"time"
 
-	acm "github.com/tendermint/tendermint/account"
-	bc "github.com/tendermint/tendermint/blockchain"
-	. "github.com/tendermint/tendermint/common"
-	"github.com/tendermint/tendermint/events"
-	mempl "github.com/tendermint/tendermint/mempool"
-	sm "github.com/tendermint/tendermint/state"
-	"github.com/tendermint/tendermint/types"
-	"github.com/tendermint/tendermint/wire"
+	acm "github.com/eris-ltd/eris-db/Godeps/_workspace/src/github.com/tendermint/tendermint/account"
+	bc "github.com/eris-ltd/eris-db/Godeps/_workspace/src/github.com/tendermint/tendermint/blockchain"
+	. "github.com/eris-ltd/eris-db/Godeps/_workspace/src/github.com/tendermint/tendermint/common"
+	"github.com/eris-ltd/eris-db/Godeps/_workspace/src/github.com/tendermint/tendermint/events"
+	mempl "github.com/eris-ltd/eris-db/Godeps/_workspace/src/github.com/tendermint/tendermint/mempool"
+	sm "github.com/eris-ltd/eris-db/Godeps/_workspace/src/github.com/tendermint/tendermint/state"
+	"github.com/eris-ltd/eris-db/Godeps/_workspace/src/github.com/tendermint/tendermint/types"
+	"github.com/eris-ltd/eris-db/Godeps/_workspace/src/github.com/tendermint/tendermint/wire"
 )
 
 var (
diff --git a/Godeps/_workspace/src/github.com/tendermint/tendermint/consensus/test.go b/Godeps/_workspace/src/github.com/tendermint/tendermint/consensus/test.go
index be0066e5515ff61332f5a86e800ebebe75f7aff3..eb5ac9391afa748238672187cccd1df2d81e6aba 100644
--- a/Godeps/_workspace/src/github.com/tendermint/tendermint/consensus/test.go
+++ b/Godeps/_workspace/src/github.com/tendermint/tendermint/consensus/test.go
@@ -6,12 +6,12 @@ import (
 	"testing"
 	"time"
 
-	bc "github.com/tendermint/tendermint/blockchain"
-	dbm "github.com/tendermint/tendermint/db"
-	mempl "github.com/tendermint/tendermint/mempool"
-	"github.com/tendermint/tendermint/p2p"
-	sm "github.com/tendermint/tendermint/state"
-	"github.com/tendermint/tendermint/types"
+	bc "github.com/eris-ltd/eris-db/Godeps/_workspace/src/github.com/tendermint/tendermint/blockchain"
+	dbm "github.com/eris-ltd/eris-db/Godeps/_workspace/src/github.com/tendermint/tendermint/db"
+	mempl "github.com/eris-ltd/eris-db/Godeps/_workspace/src/github.com/tendermint/tendermint/mempool"
+	"github.com/eris-ltd/eris-db/Godeps/_workspace/src/github.com/tendermint/tendermint/p2p"
+	sm "github.com/eris-ltd/eris-db/Godeps/_workspace/src/github.com/tendermint/tendermint/state"
+	"github.com/eris-ltd/eris-db/Godeps/_workspace/src/github.com/tendermint/tendermint/types"
 )
 
 //-------------------------------------------------------------------------------
diff --git a/Godeps/_workspace/src/github.com/tendermint/tendermint/db/config.go b/Godeps/_workspace/src/github.com/tendermint/tendermint/db/config.go
index 8c24d2fdf838c4239d425617e9d8559f1959d414..2a2934ffca193e66f13cf87f8036a55a1637cea9 100644
--- a/Godeps/_workspace/src/github.com/tendermint/tendermint/db/config.go
+++ b/Godeps/_workspace/src/github.com/tendermint/tendermint/db/config.go
@@ -1,7 +1,7 @@
 package db
 
 import (
-	cfg "github.com/tendermint/tendermint/config"
+	cfg "github.com/eris-ltd/eris-db/Godeps/_workspace/src/github.com/tendermint/tendermint/config"
 )
 
 var config cfg.Config = nil
diff --git a/Godeps/_workspace/src/github.com/tendermint/tendermint/db/db.go b/Godeps/_workspace/src/github.com/tendermint/tendermint/db/db.go
index 7c2bdaaebce054bcd5ff2dff65c8092a59e8d921..1e4933cf89a8c2d140fa4983e9282ea6db0d6c59 100644
--- a/Godeps/_workspace/src/github.com/tendermint/tendermint/db/db.go
+++ b/Godeps/_workspace/src/github.com/tendermint/tendermint/db/db.go
@@ -3,7 +3,7 @@ package db
 import (
 	"path"
 
-	. "github.com/tendermint/tendermint/common"
+	. "github.com/eris-ltd/eris-db/Godeps/_workspace/src/github.com/tendermint/tendermint/common"
 )
 
 type DB interface {
diff --git a/Godeps/_workspace/src/github.com/tendermint/tendermint/db/level_db.go b/Godeps/_workspace/src/github.com/tendermint/tendermint/db/level_db.go
index 07f51261ce3af0e933b397f968b22e455a44572f..587c3ee3f0c70306225280c0c8ae12d5ce771409 100644
--- a/Godeps/_workspace/src/github.com/tendermint/tendermint/db/level_db.go
+++ b/Godeps/_workspace/src/github.com/tendermint/tendermint/db/level_db.go
@@ -2,12 +2,12 @@ package db
 
 import (
 	"fmt"
-	"github.comsyndtr/goleveldb/leveldb"
-	"github.comsyndtr/goleveldb/leveldb/errors"
-	"github.comsyndtr/goleveldb/leveldb/opt"
+	"github.com/syndtr/goleveldb/leveldb"
+	"github.com/syndtr/goleveldb/leveldb/errors"
+	"github.com/syndtr/goleveldb/leveldb/opt"
 	"path"
 
-	. "github.com/tendermint/tendermint/common"
+	. "github.com/eris-ltd/eris-db/Godeps/_workspace/src/github.com/tendermint/tendermint/common"
 )
 
 type LevelDB struct {
diff --git a/Godeps/_workspace/src/github.com/tendermint/tendermint/events/event_cache.go b/Godeps/_workspace/src/github.com/tendermint/tendermint/events/event_cache.go
index d0109ae11df6af7892704e224a8174686ce3147f..c37793f95a8a3796c00ccba2b0a7fc343cea5897 100644
--- a/Godeps/_workspace/src/github.com/tendermint/tendermint/events/event_cache.go
+++ b/Godeps/_workspace/src/github.com/tendermint/tendermint/events/event_cache.go
@@ -1,7 +1,7 @@
 package events
 
 import (
-	"github.com/tendermint/tendermint/types"
+	"github.com/eris-ltd/eris-db/Godeps/_workspace/src/github.com/tendermint/tendermint/types"
 )
 
 const (
diff --git a/Godeps/_workspace/src/github.com/tendermint/tendermint/events/events.go b/Godeps/_workspace/src/github.com/tendermint/tendermint/events/events.go
index a4173d242a7554100f8a6f9ce3b49d70000bc63f..1b9f08f96569e95dbe0f1cc1f8ea77bfc1b757ab 100644
--- a/Godeps/_workspace/src/github.com/tendermint/tendermint/events/events.go
+++ b/Godeps/_workspace/src/github.com/tendermint/tendermint/events/events.go
@@ -3,8 +3,8 @@ package events
 import (
 	"sync"
 
-	. "github.com/tendermint/tendermint/common"
-	"github.com/tendermint/tendermint/types"
+	. "github.com/eris-ltd/eris-db/Godeps/_workspace/src/github.com/tendermint/tendermint/common"
+	"github.com/eris-ltd/eris-db/Godeps/_workspace/src/github.com/tendermint/tendermint/types"
 )
 
 // reactors and other modules should export
diff --git a/Godeps/_workspace/src/github.com/tendermint/tendermint/events/log.go b/Godeps/_workspace/src/github.com/tendermint/tendermint/events/log.go
index 5b301bdf0971c67d5be7fa840d38a9864263e6eb..232ef667b8edc6a3ced8d579b8ae13fb7a09a07f 100644
--- a/Godeps/_workspace/src/github.com/tendermint/tendermint/events/log.go
+++ b/Godeps/_workspace/src/github.com/tendermint/tendermint/events/log.go
@@ -1,7 +1,7 @@
 package events
 
 import (
-	"github.com/tendermint/tendermint/logger"
+	"github.com/eris-ltd/eris-db/Godeps/_workspace/src/github.com/tendermint/tendermint/logger"
 )
 
 var log = logger.New("module", "events")
diff --git a/Godeps/_workspace/src/github.com/tendermint/tendermint/logger/config.go b/Godeps/_workspace/src/github.com/tendermint/tendermint/logger/config.go
index 88eb6b61356c73616007c7fcbea948b4b34db103..e5c5fdada143c0a6584de201aba2e5f8a89ccb6a 100644
--- a/Godeps/_workspace/src/github.com/tendermint/tendermint/logger/config.go
+++ b/Godeps/_workspace/src/github.com/tendermint/tendermint/logger/config.go
@@ -1,7 +1,7 @@
 package logger
 
 import (
-	cfg "github.com/tendermint/tendermint/config"
+	cfg "github.com/eris-ltd/eris-db/Godeps/_workspace/src/github.com/tendermint/tendermint/config"
 )
 
 var config cfg.Config = nil
diff --git a/Godeps/_workspace/src/github.com/tendermint/tendermint/logger/log.go b/Godeps/_workspace/src/github.com/tendermint/tendermint/logger/log.go
index b2d0a5e3ab5b98a9bb1e95fc3760ae247fdc705a..f93b21abfea32c8f07d083ccd54f65c3c881e456 100644
--- a/Godeps/_workspace/src/github.com/tendermint/tendermint/logger/log.go
+++ b/Godeps/_workspace/src/github.com/tendermint/tendermint/logger/log.go
@@ -3,8 +3,8 @@ package logger
 import (
 	"os"
 
-	"github.com/tendermint/log15"
-	. "github.com/tendermint/tendermint/common"
+	"github.com/eris-ltd/eris-db/Godeps/_workspace/src/github.com/tendermint/log15"
+	. "github.com/eris-ltd/eris-db/Godeps/_workspace/src/github.com/tendermint/tendermint/common"
 )
 
 var rootHandler log15.Handler
diff --git a/Godeps/_workspace/src/github.com/tendermint/tendermint/mempool/log.go b/Godeps/_workspace/src/github.com/tendermint/tendermint/mempool/log.go
index 0bc62b105489e7202c9ceef57ecca2a8fd1f0fbb..724a9a3668bf9a167ed9a5baabafe6fbd412f34b 100644
--- a/Godeps/_workspace/src/github.com/tendermint/tendermint/mempool/log.go
+++ b/Godeps/_workspace/src/github.com/tendermint/tendermint/mempool/log.go
@@ -1,7 +1,7 @@
 package mempool
 
 import (
-	"github.com/tendermint/tendermint/logger"
+	"github.com/eris-ltd/eris-db/Godeps/_workspace/src/github.com/tendermint/tendermint/logger"
 )
 
 var log = logger.New("module", "mempool")
diff --git a/Godeps/_workspace/src/github.com/tendermint/tendermint/mempool/mempool.go b/Godeps/_workspace/src/github.com/tendermint/tendermint/mempool/mempool.go
index e0e09f04ff89d80b934c108168ba931c4ece8560..c1b580f481742ec2a078a971e329749f5f372140 100644
--- a/Godeps/_workspace/src/github.com/tendermint/tendermint/mempool/mempool.go
+++ b/Godeps/_workspace/src/github.com/tendermint/tendermint/mempool/mempool.go
@@ -11,8 +11,8 @@ package mempool
 import (
 	"sync"
 
-	sm "github.com/tendermint/tendermint/state"
-	"github.com/tendermint/tendermint/types"
+	sm "github.com/eris-ltd/eris-db/Godeps/_workspace/src/github.com/tendermint/tendermint/state"
+	"github.com/eris-ltd/eris-db/Godeps/_workspace/src/github.com/tendermint/tendermint/types"
 )
 
 type Mempool struct {
diff --git a/Godeps/_workspace/src/github.com/tendermint/tendermint/mempool/reactor.go b/Godeps/_workspace/src/github.com/tendermint/tendermint/mempool/reactor.go
index 2e6e36ec654a5437c3fe1ff80ee9fcbffee92995..fb3ff7d74cb6b7eaa235a5868fc0c527a2884b6c 100644
--- a/Godeps/_workspace/src/github.com/tendermint/tendermint/mempool/reactor.go
+++ b/Godeps/_workspace/src/github.com/tendermint/tendermint/mempool/reactor.go
@@ -5,11 +5,11 @@ import (
 	"fmt"
 	"reflect"
 
-	. "github.com/tendermint/tendermint/common"
-	"github.com/tendermint/tendermint/events"
-	"github.com/tendermint/tendermint/p2p"
-	"github.com/tendermint/tendermint/types"
-	"github.com/tendermint/tendermint/wire"
+	. "github.com/eris-ltd/eris-db/Godeps/_workspace/src/github.com/tendermint/tendermint/common"
+	"github.com/eris-ltd/eris-db/Godeps/_workspace/src/github.com/tendermint/tendermint/events"
+	"github.com/eris-ltd/eris-db/Godeps/_workspace/src/github.com/tendermint/tendermint/p2p"
+	"github.com/eris-ltd/eris-db/Godeps/_workspace/src/github.com/tendermint/tendermint/types"
+	"github.com/eris-ltd/eris-db/Godeps/_workspace/src/github.com/tendermint/tendermint/wire"
 )
 
 var (
diff --git a/Godeps/_workspace/src/github.com/tendermint/tendermint/merkle/iavl_node.go b/Godeps/_workspace/src/github.com/tendermint/tendermint/merkle/iavl_node.go
index 6305a9495af39eebfea8ce61a008ebdbfb37c923..884842a60140204e424116e42496ce450ba4b01f 100644
--- a/Godeps/_workspace/src/github.com/tendermint/tendermint/merkle/iavl_node.go
+++ b/Godeps/_workspace/src/github.com/tendermint/tendermint/merkle/iavl_node.go
@@ -5,8 +5,8 @@ import (
 	"github.com/eris-ltd/eris-db/Godeps/_workspace/src/code.google.com/p/go.crypto/ripemd160"
 	"io"
 
-	. "github.com/tendermint/tendermint/common"
-	"github.com/tendermint/tendermint/wire"
+	. "github.com/eris-ltd/eris-db/Godeps/_workspace/src/github.com/tendermint/tendermint/common"
+	"github.com/eris-ltd/eris-db/Godeps/_workspace/src/github.com/tendermint/tendermint/wire"
 )
 
 // Node
diff --git a/Godeps/_workspace/src/github.com/tendermint/tendermint/merkle/iavl_proof.go b/Godeps/_workspace/src/github.com/tendermint/tendermint/merkle/iavl_proof.go
index baf41dcffdfdccf6adb1fb05fb1edf5f1e26a9ac..f86efe467c415334c053a6e558b378527b94b4e1 100644
--- a/Godeps/_workspace/src/github.com/tendermint/tendermint/merkle/iavl_proof.go
+++ b/Godeps/_workspace/src/github.com/tendermint/tendermint/merkle/iavl_proof.go
@@ -5,8 +5,8 @@ import (
 
 	"github.com/eris-ltd/eris-db/Godeps/_workspace/src/code.google.com/p/go.crypto/ripemd160"
 
-	. "github.com/tendermint/tendermint/common"
-	"github.com/tendermint/tendermint/wire"
+	. "github.com/eris-ltd/eris-db/Godeps/_workspace/src/github.com/tendermint/tendermint/common"
+	"github.com/eris-ltd/eris-db/Godeps/_workspace/src/github.com/tendermint/tendermint/wire"
 )
 
 type IAVLProof struct {
diff --git a/Godeps/_workspace/src/github.com/tendermint/tendermint/merkle/iavl_test.go b/Godeps/_workspace/src/github.com/tendermint/tendermint/merkle/iavl_test.go
index 457fe4facda4463ed73a8bed3a23432414e2bca9..bf97067f995205d5e655bc8ef3b68f38f7125ca4 100644
--- a/Godeps/_workspace/src/github.com/tendermint/tendermint/merkle/iavl_test.go
+++ b/Godeps/_workspace/src/github.com/tendermint/tendermint/merkle/iavl_test.go
@@ -4,10 +4,10 @@ import (
 	"bytes"
 	"fmt"
 
-	. "github.com/tendermint/tendermint/common"
-	. "github.com/tendermint/tendermint/common/test"
-	"github.com/tendermint/tendermint/db"
-	"github.com/tendermint/tendermint/wire"
+	. "github.com/eris-ltd/eris-db/Godeps/_workspace/src/github.com/tendermint/tendermint/common"
+	. "github.com/eris-ltd/eris-db/Godeps/_workspace/src/github.com/tendermint/tendermint/common/test"
+	"github.com/eris-ltd/eris-db/Godeps/_workspace/src/github.com/tendermint/tendermint/db"
+	"github.com/eris-ltd/eris-db/Godeps/_workspace/src/github.com/tendermint/tendermint/wire"
 
 	"runtime"
 	"testing"
diff --git a/Godeps/_workspace/src/github.com/tendermint/tendermint/merkle/iavl_tree.go b/Godeps/_workspace/src/github.com/tendermint/tendermint/merkle/iavl_tree.go
index 4446f11d1b7bd97743cb61dc432ba8220c5aba70..b8177f6a2499ffa210631bda37227cf1c4d97b10 100644
--- a/Godeps/_workspace/src/github.com/tendermint/tendermint/merkle/iavl_tree.go
+++ b/Godeps/_workspace/src/github.com/tendermint/tendermint/merkle/iavl_tree.go
@@ -5,9 +5,9 @@ import (
 	"container/list"
 	"sync"
 
-	. "github.com/tendermint/tendermint/common"
-	dbm "github.com/tendermint/tendermint/db"
-	"github.com/tendermint/tendermint/wire"
+	. "github.com/eris-ltd/eris-db/Godeps/_workspace/src/github.com/tendermint/tendermint/common"
+	dbm "github.com/eris-ltd/eris-db/Godeps/_workspace/src/github.com/tendermint/tendermint/db"
+	"github.com/eris-ltd/eris-db/Godeps/_workspace/src/github.com/tendermint/tendermint/wire"
 )
 
 /*
diff --git a/Godeps/_workspace/src/github.com/tendermint/tendermint/merkle/simple_tree.go b/Godeps/_workspace/src/github.com/tendermint/tendermint/merkle/simple_tree.go
index edace7215de7f7bcaf22eb181a5d6ee387c95fab..31ad41c16da56bf83acae10c1742803f2ec9f30b 100644
--- a/Godeps/_workspace/src/github.com/tendermint/tendermint/merkle/simple_tree.go
+++ b/Godeps/_workspace/src/github.com/tendermint/tendermint/merkle/simple_tree.go
@@ -31,8 +31,8 @@ import (
 
 	"github.com/eris-ltd/eris-db/Godeps/_workspace/src/code.google.com/p/go.crypto/ripemd160"
 
-	. "github.com/tendermint/tendermint/common"
-	"github.com/tendermint/tendermint/wire"
+	. "github.com/eris-ltd/eris-db/Godeps/_workspace/src/github.com/tendermint/tendermint/common"
+	"github.com/eris-ltd/eris-db/Godeps/_workspace/src/github.com/tendermint/tendermint/wire"
 )
 
 func SimpleHashFromTwoHashes(left []byte, right []byte) []byte {
diff --git a/Godeps/_workspace/src/github.com/tendermint/tendermint/merkle/simple_tree_test.go b/Godeps/_workspace/src/github.com/tendermint/tendermint/merkle/simple_tree_test.go
index af6ff4df926885011ea0fd429a0306acd522997a..1b673cc8f4cbc00896da3b7703dba36fc6338b27 100644
--- a/Godeps/_workspace/src/github.com/tendermint/tendermint/merkle/simple_tree_test.go
+++ b/Godeps/_workspace/src/github.com/tendermint/tendermint/merkle/simple_tree_test.go
@@ -3,8 +3,8 @@ package merkle
 import (
 	"bytes"
 
-	. "github.com/tendermint/tendermint/common"
-	. "github.com/tendermint/tendermint/common/test"
+	. "github.com/eris-ltd/eris-db/Godeps/_workspace/src/github.com/tendermint/tendermint/common"
+	. "github.com/eris-ltd/eris-db/Godeps/_workspace/src/github.com/tendermint/tendermint/common/test"
 
 	"fmt"
 	"testing"
diff --git a/Godeps/_workspace/src/github.com/tendermint/tendermint/node/config.go b/Godeps/_workspace/src/github.com/tendermint/tendermint/node/config.go
index f78e7577249e8095e024e77e41cb110f8956fbc3..67e802981239b922996aa717ebba2b1301ca106e 100644
--- a/Godeps/_workspace/src/github.com/tendermint/tendermint/node/config.go
+++ b/Godeps/_workspace/src/github.com/tendermint/tendermint/node/config.go
@@ -1,7 +1,7 @@
 package node
 
 import (
-	cfg "github.com/tendermint/tendermint/config"
+	cfg "github.com/eris-ltd/eris-db/Godeps/_workspace/src/github.com/tendermint/tendermint/config"
 )
 
 var config cfg.Config = nil
diff --git a/Godeps/_workspace/src/github.com/tendermint/tendermint/node/id.go b/Godeps/_workspace/src/github.com/tendermint/tendermint/node/id.go
index 2d52213f1f351a643a366e523accc76aa6eadb0b..23c75f3451e5f42367d745937b1bcc254242c6f9 100644
--- a/Godeps/_workspace/src/github.com/tendermint/tendermint/node/id.go
+++ b/Godeps/_workspace/src/github.com/tendermint/tendermint/node/id.go
@@ -1,7 +1,7 @@
 package node
 
 import (
-	acm "github.com/tendermint/tendermint/account"
+	acm "github.com/eris-ltd/eris-db/Godeps/_workspace/src/github.com/tendermint/tendermint/account"
 	"time"
 )
 
diff --git a/Godeps/_workspace/src/github.com/tendermint/tendermint/node/log.go b/Godeps/_workspace/src/github.com/tendermint/tendermint/node/log.go
index 65e5e78fe614baf888667962da9abcd9879ee615..73ac43eb67340eb8cafb11a0ae041f3d87b9dde3 100644
--- a/Godeps/_workspace/src/github.com/tendermint/tendermint/node/log.go
+++ b/Godeps/_workspace/src/github.com/tendermint/tendermint/node/log.go
@@ -1,7 +1,7 @@
 package node
 
 import (
-	"github.com/tendermint/tendermint/logger"
+	"github.com/eris-ltd/eris-db/Godeps/_workspace/src/github.com/tendermint/tendermint/logger"
 )
 
 var log = logger.New("module", "node")
diff --git a/Godeps/_workspace/src/github.com/tendermint/tendermint/node/node.go b/Godeps/_workspace/src/github.com/tendermint/tendermint/node/node.go
index 99594a33f19537bcaad025088e557d2deea31d4d..c30a958ce03dbcf8b1912a8c3b17693dd0f64f9e 100644
--- a/Godeps/_workspace/src/github.com/tendermint/tendermint/node/node.go
+++ b/Godeps/_workspace/src/github.com/tendermint/tendermint/node/node.go
@@ -10,21 +10,21 @@ import (
 	"strings"
 	"time"
 
-	acm "github.com/tendermint/tendermint/account"
-	bc "github.com/tendermint/tendermint/blockchain"
-	. "github.com/tendermint/tendermint/common"
-	"github.com/tendermint/tendermint/consensus"
-	dbm "github.com/tendermint/tendermint/db"
-	"github.com/tendermint/tendermint/events"
-	mempl "github.com/tendermint/tendermint/mempool"
-	"github.com/tendermint/tendermint/p2p"
-	"github.com/tendermint/tendermint/rpc"
-	"github.com/tendermint/tendermint/rpc/core"
-	"github.com/tendermint/tendermint/rpc/server"
-	sm "github.com/tendermint/tendermint/state"
-	stypes "github.com/tendermint/tendermint/state/types"
-	"github.com/tendermint/tendermint/types"
-	"github.com/tendermint/tendermint/wire"
+	acm "github.com/eris-ltd/eris-db/Godeps/_workspace/src/github.com/tendermint/tendermint/account"
+	bc "github.com/eris-ltd/eris-db/Godeps/_workspace/src/github.com/tendermint/tendermint/blockchain"
+	. "github.com/eris-ltd/eris-db/Godeps/_workspace/src/github.com/tendermint/tendermint/common"
+	"github.com/eris-ltd/eris-db/Godeps/_workspace/src/github.com/tendermint/tendermint/consensus"
+	dbm "github.com/eris-ltd/eris-db/Godeps/_workspace/src/github.com/tendermint/tendermint/db"
+	"github.com/eris-ltd/eris-db/Godeps/_workspace/src/github.com/tendermint/tendermint/events"
+	mempl "github.com/eris-ltd/eris-db/Godeps/_workspace/src/github.com/tendermint/tendermint/mempool"
+	"github.com/eris-ltd/eris-db/Godeps/_workspace/src/github.com/tendermint/tendermint/p2p"
+	"github.com/eris-ltd/eris-db/Godeps/_workspace/src/github.com/tendermint/tendermint/rpc"
+	"github.com/eris-ltd/eris-db/Godeps/_workspace/src/github.com/tendermint/tendermint/rpc/core"
+	"github.com/eris-ltd/eris-db/Godeps/_workspace/src/github.com/tendermint/tendermint/rpc/server"
+	sm "github.com/eris-ltd/eris-db/Godeps/_workspace/src/github.com/tendermint/tendermint/state"
+	stypes "github.com/eris-ltd/eris-db/Godeps/_workspace/src/github.com/tendermint/tendermint/state/types"
+	"github.com/eris-ltd/eris-db/Godeps/_workspace/src/github.com/tendermint/tendermint/types"
+	"github.com/eris-ltd/eris-db/Godeps/_workspace/src/github.com/tendermint/tendermint/wire"
 )
 
 import _ "net/http/pprof"
diff --git a/Godeps/_workspace/src/github.com/tendermint/tendermint/node/node_test.go b/Godeps/_workspace/src/github.com/tendermint/tendermint/node/node_test.go
index a958c96cbb571de78c493d9205ed234ce91980f6..01f601cf1a4a29288d1a3ba115acd5ec7340b5b3 100644
--- a/Godeps/_workspace/src/github.com/tendermint/tendermint/node/node_test.go
+++ b/Godeps/_workspace/src/github.com/tendermint/tendermint/node/node_test.go
@@ -4,8 +4,8 @@ import (
 	"testing"
 	"time"
 
-	_ "github.com/tendermint/tendermint/config/tendermint_test"
-	"github.com/tendermint/tendermint/p2p"
+	_ "github.com/eris-ltd/eris-db/Godeps/_workspace/src/github.com/tendermint/tendermint/config/tendermint_test"
+	"github.com/eris-ltd/eris-db/Godeps/_workspace/src/github.com/tendermint/tendermint/p2p"
 )
 
 func TestNodeStartStop(t *testing.T) {
diff --git a/Godeps/_workspace/src/github.com/tendermint/tendermint/p2p/addrbook.go b/Godeps/_workspace/src/github.com/tendermint/tendermint/p2p/addrbook.go
index 9e24475104ee843278da56c132398ebf2dae7d8b..33ec57fce086ffee562e8bae2ec0e81ce5bdf5da 100644
--- a/Godeps/_workspace/src/github.com/tendermint/tendermint/p2p/addrbook.go
+++ b/Godeps/_workspace/src/github.com/tendermint/tendermint/p2p/addrbook.go
@@ -14,7 +14,7 @@ import (
 	"sync"
 	"time"
 
-	. "github.com/tendermint/tendermint/common"
+	. "github.com/eris-ltd/eris-db/Godeps/_workspace/src/github.com/tendermint/tendermint/common"
 )
 
 const (
diff --git a/Godeps/_workspace/src/github.com/tendermint/tendermint/p2p/config.go b/Godeps/_workspace/src/github.com/tendermint/tendermint/p2p/config.go
index c9cbf1264f4c4441ca8395f2beb68f5d92edcc87..95bf4a7c4a3b4448f0daabc5af843861b260648e 100644
--- a/Godeps/_workspace/src/github.com/tendermint/tendermint/p2p/config.go
+++ b/Godeps/_workspace/src/github.com/tendermint/tendermint/p2p/config.go
@@ -1,7 +1,7 @@
 package p2p
 
 import (
-	cfg "github.com/tendermint/tendermint/config"
+	cfg "github.com/eris-ltd/eris-db/Godeps/_workspace/src/github.com/tendermint/tendermint/config"
 )
 
 var config cfg.Config = nil
diff --git a/Godeps/_workspace/src/github.com/tendermint/tendermint/p2p/connection.go b/Godeps/_workspace/src/github.com/tendermint/tendermint/p2p/connection.go
index 1776c94411325812b0f0747dbb989bc5f988ff7c..812196794db5d70ae408aad4230422b641022f77 100644
--- a/Godeps/_workspace/src/github.com/tendermint/tendermint/p2p/connection.go
+++ b/Godeps/_workspace/src/github.com/tendermint/tendermint/p2p/connection.go
@@ -11,8 +11,8 @@ import (
 	"time"
 
 	flow "github.com/eris-ltd/eris-db/Godeps/_workspace/src/code.google.com/p/mxk/go1/flowcontrol"
-	. "github.com/tendermint/tendermint/common"
-	"github.com/tendermint/tendermint/wire" //"github.com/tendermint/log15"
+	. "github.com/eris-ltd/eris-db/Godeps/_workspace/src/github.com/tendermint/tendermint/common"
+	"github.com/eris-ltd/eris-db/Godeps/_workspace/src/github.com/tendermint/tendermint/wire" //"github.com/tendermint/log15"
 )
 
 const (
diff --git a/Godeps/_workspace/src/github.com/tendermint/tendermint/p2p/listener.go b/Godeps/_workspace/src/github.com/tendermint/tendermint/p2p/listener.go
index 131d969570a13667352a0198c2331fe04d0aabd1..a3ab5513865306978ae9fbd3a3d159c0c76a6bf8 100644
--- a/Godeps/_workspace/src/github.com/tendermint/tendermint/p2p/listener.go
+++ b/Godeps/_workspace/src/github.com/tendermint/tendermint/p2p/listener.go
@@ -6,8 +6,8 @@ import (
 	"strconv"
 	"time"
 
-	. "github.com/tendermint/tendermint/common"
-	"github.com/tendermint/tendermint/p2p/upnp"
+	. "github.com/eris-ltd/eris-db/Godeps/_workspace/src/github.com/tendermint/tendermint/common"
+	"github.com/eris-ltd/eris-db/Godeps/_workspace/src/github.com/tendermint/tendermint/p2p/upnp"
 )
 
 type Listener interface {
diff --git a/Godeps/_workspace/src/github.com/tendermint/tendermint/p2p/log.go b/Godeps/_workspace/src/github.com/tendermint/tendermint/p2p/log.go
index 7802aa7674585029fa29a18cecd92a4f47cfdc55..319af3567266e3b809a517c9a07b10497130d8c9 100644
--- a/Godeps/_workspace/src/github.com/tendermint/tendermint/p2p/log.go
+++ b/Godeps/_workspace/src/github.com/tendermint/tendermint/p2p/log.go
@@ -1,7 +1,7 @@
 package p2p
 
 import (
-	"github.com/tendermint/tendermint/logger"
+	"github.com/eris-ltd/eris-db/Godeps/_workspace/src/github.com/tendermint/tendermint/logger"
 )
 
 var log = logger.New("module", "p2p")
diff --git a/Godeps/_workspace/src/github.com/tendermint/tendermint/p2p/netaddress.go b/Godeps/_workspace/src/github.com/tendermint/tendermint/p2p/netaddress.go
index 0730ab94272fc933490d1df184f8c9276c8046f5..8588ff73b82a3f2276698b1f8127a652f726e5c6 100644
--- a/Godeps/_workspace/src/github.com/tendermint/tendermint/p2p/netaddress.go
+++ b/Godeps/_workspace/src/github.com/tendermint/tendermint/p2p/netaddress.go
@@ -10,7 +10,7 @@ import (
 	"strconv"
 	"time"
 
-	. "github.com/tendermint/tendermint/common"
+	. "github.com/eris-ltd/eris-db/Godeps/_workspace/src/github.com/tendermint/tendermint/common"
 )
 
 type NetAddress struct {
diff --git a/Godeps/_workspace/src/github.com/tendermint/tendermint/p2p/peer.go b/Godeps/_workspace/src/github.com/tendermint/tendermint/p2p/peer.go
index a03f8713bdbee2aa29921bb084e6997991af54fe..82ff986b917618ac1f9b5c5e74a27e522d3e2570 100644
--- a/Godeps/_workspace/src/github.com/tendermint/tendermint/p2p/peer.go
+++ b/Godeps/_workspace/src/github.com/tendermint/tendermint/p2p/peer.go
@@ -5,9 +5,9 @@ import (
 	"io"
 	"net"
 
-	. "github.com/tendermint/tendermint/common"
-	"github.com/tendermint/tendermint/types"
-	"github.com/tendermint/tendermint/wire"
+	. "github.com/eris-ltd/eris-db/Godeps/_workspace/src/github.com/tendermint/tendermint/common"
+	"github.com/eris-ltd/eris-db/Godeps/_workspace/src/github.com/tendermint/tendermint/types"
+	"github.com/eris-ltd/eris-db/Godeps/_workspace/src/github.com/tendermint/tendermint/wire"
 )
 
 type Peer struct {
diff --git a/Godeps/_workspace/src/github.com/tendermint/tendermint/p2p/peer_set_test.go b/Godeps/_workspace/src/github.com/tendermint/tendermint/p2p/peer_set_test.go
index 90bd86709a471ce333208984a7cb26586a36b13a..75301e043a81c01aa35cd88287d13495c6a36af8 100644
--- a/Godeps/_workspace/src/github.com/tendermint/tendermint/p2p/peer_set_test.go
+++ b/Godeps/_workspace/src/github.com/tendermint/tendermint/p2p/peer_set_test.go
@@ -5,8 +5,8 @@ import (
 	"strings"
 	"testing"
 
-	. "github.com/tendermint/tendermint/common"
-	"github.com/tendermint/tendermint/types"
+	. "github.com/eris-ltd/eris-db/Godeps/_workspace/src/github.com/tendermint/tendermint/common"
+	"github.com/eris-ltd/eris-db/Godeps/_workspace/src/github.com/tendermint/tendermint/types"
 )
 
 // Returns an empty dummy peer
diff --git a/Godeps/_workspace/src/github.com/tendermint/tendermint/p2p/pex_reactor.go b/Godeps/_workspace/src/github.com/tendermint/tendermint/p2p/pex_reactor.go
index e203063c6e194ef4a3e2b6fe95e86662db2dbd1e..2c77db13f037c052ed64398155374861ff50f30c 100644
--- a/Godeps/_workspace/src/github.com/tendermint/tendermint/p2p/pex_reactor.go
+++ b/Godeps/_workspace/src/github.com/tendermint/tendermint/p2p/pex_reactor.go
@@ -8,9 +8,9 @@ import (
 	"reflect"
 	"time"
 
-	. "github.com/tendermint/tendermint/common"
-	"github.com/tendermint/tendermint/events"
-	"github.com/tendermint/tendermint/wire"
+	. "github.com/eris-ltd/eris-db/Godeps/_workspace/src/github.com/tendermint/tendermint/common"
+	"github.com/eris-ltd/eris-db/Godeps/_workspace/src/github.com/tendermint/tendermint/events"
+	"github.com/eris-ltd/eris-db/Godeps/_workspace/src/github.com/tendermint/tendermint/wire"
 )
 
 var pexErrInvalidMessage = errors.New("Invalid PEX message")
diff --git a/Godeps/_workspace/src/github.com/tendermint/tendermint/p2p/secret_connection.go b/Godeps/_workspace/src/github.com/tendermint/tendermint/p2p/secret_connection.go
index 443e5e9627a4c27f7d88a7612762ee50e9d2d94c..d00cba0e5ba6c7e1806e28db67dff27e8f3a287a 100644
--- a/Godeps/_workspace/src/github.com/tendermint/tendermint/p2p/secret_connection.go
+++ b/Godeps/_workspace/src/github.com/tendermint/tendermint/p2p/secret_connection.go
@@ -20,9 +20,9 @@ import (
 	"github.com/eris-ltd/eris-db/Godeps/_workspace/src/golang.org/x/crypto/nacl/secretbox"
 	"github.com/eris-ltd/eris-db/Godeps/_workspace/src/golang.org/x/crypto/ripemd160"
 
-	acm "github.com/tendermint/tendermint/account"
-	. "github.com/tendermint/tendermint/common"
-	"github.com/tendermint/tendermint/wire"
+	acm "github.com/eris-ltd/eris-db/Godeps/_workspace/src/github.com/tendermint/tendermint/account"
+	. "github.com/eris-ltd/eris-db/Godeps/_workspace/src/github.com/tendermint/tendermint/common"
+	"github.com/eris-ltd/eris-db/Godeps/_workspace/src/github.com/tendermint/tendermint/wire"
 )
 
 // 2 + 1024 == 1026 total frame size
diff --git a/Godeps/_workspace/src/github.com/tendermint/tendermint/p2p/secret_connection_test.go b/Godeps/_workspace/src/github.com/tendermint/tendermint/p2p/secret_connection_test.go
index 28921ff72182ea2565151f9b23597a86c160c0cd..32bf1aac1de263bfb7f0e1abbadab39257c59de0 100644
--- a/Godeps/_workspace/src/github.com/tendermint/tendermint/p2p/secret_connection_test.go
+++ b/Godeps/_workspace/src/github.com/tendermint/tendermint/p2p/secret_connection_test.go
@@ -5,8 +5,8 @@ import (
 	"io"
 	"testing"
 
-	acm "github.com/tendermint/tendermint/account"
-	. "github.com/tendermint/tendermint/common"
+	acm "github.com/eris-ltd/eris-db/Godeps/_workspace/src/github.com/tendermint/tendermint/account"
+	. "github.com/eris-ltd/eris-db/Godeps/_workspace/src/github.com/tendermint/tendermint/common"
 )
 
 type dummyConn struct {
diff --git a/Godeps/_workspace/src/github.com/tendermint/tendermint/p2p/switch.go b/Godeps/_workspace/src/github.com/tendermint/tendermint/p2p/switch.go
index d260cf032ad4451d028a95abdf88cb0b2a5f5b25..661aee12ea3210aceda64f9a190cf2a2ad8331cd 100644
--- a/Godeps/_workspace/src/github.com/tendermint/tendermint/p2p/switch.go
+++ b/Godeps/_workspace/src/github.com/tendermint/tendermint/p2p/switch.go
@@ -7,10 +7,10 @@ import (
 	"strconv"
 	"time"
 
-	"github.com/tendermint/log15"
-	acm "github.com/tendermint/tendermint/account"
-	. "github.com/tendermint/tendermint/common"
-	"github.com/tendermint/tendermint/types"
+	"github.com/eris-ltd/eris-db/Godeps/_workspace/src/github.com/tendermint/log15"
+	acm "github.com/eris-ltd/eris-db/Godeps/_workspace/src/github.com/tendermint/tendermint/account"
+	. "github.com/eris-ltd/eris-db/Godeps/_workspace/src/github.com/tendermint/tendermint/common"
+	"github.com/eris-ltd/eris-db/Godeps/_workspace/src/github.com/tendermint/tendermint/types"
 )
 
 type Reactor interface {
diff --git a/Godeps/_workspace/src/github.com/tendermint/tendermint/p2p/switch_test.go b/Godeps/_workspace/src/github.com/tendermint/tendermint/p2p/switch_test.go
index ac4d35cf60270236ef81dd5f881b782842a14790..3be0386d0cf8628b67f392e318f801fd2180ead7 100644
--- a/Godeps/_workspace/src/github.com/tendermint/tendermint/p2p/switch_test.go
+++ b/Godeps/_workspace/src/github.com/tendermint/tendermint/p2p/switch_test.go
@@ -6,11 +6,11 @@ import (
 	"testing"
 	"time"
 
-	acm "github.com/tendermint/tendermint/account"
-	. "github.com/tendermint/tendermint/common"
-	_ "github.com/tendermint/tendermint/config/tendermint_test"
-	"github.com/tendermint/tendermint/types"
-	"github.com/tendermint/tendermint/wire"
+	acm "github.com/eris-ltd/eris-db/Godeps/_workspace/src/github.com/tendermint/tendermint/account"
+	. "github.com/eris-ltd/eris-db/Godeps/_workspace/src/github.com/tendermint/tendermint/common"
+	_ "github.com/eris-ltd/eris-db/Godeps/_workspace/src/github.com/tendermint/tendermint/config/tendermint_test"
+	"github.com/eris-ltd/eris-db/Godeps/_workspace/src/github.com/tendermint/tendermint/types"
+	"github.com/eris-ltd/eris-db/Godeps/_workspace/src/github.com/tendermint/tendermint/wire"
 )
 
 type PeerMessage struct {
diff --git a/Godeps/_workspace/src/github.com/tendermint/tendermint/p2p/upnp/log.go b/Godeps/_workspace/src/github.com/tendermint/tendermint/p2p/upnp/log.go
index 49f53c863816e9f27a808a14e8dd03645c2ca417..335429fa0f6a114a7fba23745108980975e3ed40 100644
--- a/Godeps/_workspace/src/github.com/tendermint/tendermint/p2p/upnp/log.go
+++ b/Godeps/_workspace/src/github.com/tendermint/tendermint/p2p/upnp/log.go
@@ -1,7 +1,7 @@
 package upnp
 
 import (
-	"github.com/tendermint/tendermint/logger"
+	"github.com/eris-ltd/eris-db/Godeps/_workspace/src/github.com/tendermint/tendermint/logger"
 )
 
 var log = logger.New("module", "upnp")
diff --git a/Godeps/_workspace/src/github.com/tendermint/tendermint/p2p/upnp/probe.go b/Godeps/_workspace/src/github.com/tendermint/tendermint/p2p/upnp/probe.go
index 3f9f8ad94eb495a6aa68ac2dd8b6890790318a18..4de2f8ca84d153f410d17a90ded11c5cb0b1c34d 100644
--- a/Godeps/_workspace/src/github.com/tendermint/tendermint/p2p/upnp/probe.go
+++ b/Godeps/_workspace/src/github.com/tendermint/tendermint/p2p/upnp/probe.go
@@ -6,7 +6,7 @@ import (
 	"net"
 	"time"
 
-	. "github.com/tendermint/tendermint/common"
+	. "github.com/eris-ltd/eris-db/Godeps/_workspace/src/github.com/tendermint/tendermint/common"
 )
 
 type UPNPCapabilities struct {
diff --git a/Godeps/_workspace/src/github.com/tendermint/tendermint/permission/types/permissions.go b/Godeps/_workspace/src/github.com/tendermint/tendermint/permission/types/permissions.go
index 74242ae48e37339e50b2bd28f2d83b785554ff6d..3fa8f3dc7e60042b49e692d75727c861e7a49e42 100644
--- a/Godeps/_workspace/src/github.com/tendermint/tendermint/permission/types/permissions.go
+++ b/Godeps/_workspace/src/github.com/tendermint/tendermint/permission/types/permissions.go
@@ -2,7 +2,7 @@ package types
 
 import (
 	"fmt"
-	. "github.com/tendermint/tendermint/common"
+	. "github.com/eris-ltd/eris-db/Godeps/_workspace/src/github.com/tendermint/tendermint/common"
 )
 
 //------------------------------------------------------------------------------------------------
diff --git a/Godeps/_workspace/src/github.com/tendermint/tendermint/permission/types/snatives.go b/Godeps/_workspace/src/github.com/tendermint/tendermint/permission/types/snatives.go
index 3fad9bd8f16e16b1eb4119bee82d97f4bb01bef7..0b612bd316fb1f7f1505788b114e546bd24cbe8b 100644
--- a/Godeps/_workspace/src/github.com/tendermint/tendermint/permission/types/snatives.go
+++ b/Godeps/_workspace/src/github.com/tendermint/tendermint/permission/types/snatives.go
@@ -1,7 +1,7 @@
 package types
 
 import (
-	"github.com/tendermint/tendermint/wire"
+	"github.com/eris-ltd/eris-db/Godeps/_workspace/src/github.com/tendermint/tendermint/wire"
 )
 
 //---------------------------------------------------------------------------------------------------
diff --git a/Godeps/_workspace/src/github.com/tendermint/tendermint/rpc/client/client.go b/Godeps/_workspace/src/github.com/tendermint/tendermint/rpc/client/client.go
index 3b138c5b5b8002d6cc2b2c9940d2875d9c002b84..a6b41cfae45636382b8f53f16c76d58d88ec9fb5 100644
--- a/Godeps/_workspace/src/github.com/tendermint/tendermint/rpc/client/client.go
+++ b/Godeps/_workspace/src/github.com/tendermint/tendermint/rpc/client/client.go
@@ -7,9 +7,9 @@ import (
 	"io/ioutil"
 	"net/http"
 
-	. "github.com/tendermint/tendermint/common"
-	. "github.com/tendermint/tendermint/rpc/types"
-	"github.com/tendermint/tendermint/wire"
+	. "github.com/eris-ltd/eris-db/Godeps/_workspace/src/github.com/tendermint/tendermint/common"
+	. "github.com/eris-ltd/eris-db/Godeps/_workspace/src/github.com/tendermint/tendermint/rpc/types"
+	"github.com/eris-ltd/eris-db/Godeps/_workspace/src/github.com/tendermint/tendermint/wire"
 )
 
 func Call(remote string, method string, params []interface{}, dest interface{}) (interface{}, error) {
diff --git a/Godeps/_workspace/src/github.com/tendermint/tendermint/rpc/client/log.go b/Godeps/_workspace/src/github.com/tendermint/tendermint/rpc/client/log.go
index 8b33e2f1000da5c9b825671fa612f0dc00587ca4..bfebc78dba1d3338bcb1ab663561822184cbd0ed 100644
--- a/Godeps/_workspace/src/github.com/tendermint/tendermint/rpc/client/log.go
+++ b/Godeps/_workspace/src/github.com/tendermint/tendermint/rpc/client/log.go
@@ -1,7 +1,7 @@
 package rpcclient
 
 import (
-	"github.com/tendermint/log15"
+	"github.com/eris-ltd/eris-db/Godeps/_workspace/src/github.com/tendermint/log15"
 )
 
 var log = log15.New("module", "rpcclient")
diff --git a/Godeps/_workspace/src/github.com/tendermint/tendermint/rpc/core/accounts.go b/Godeps/_workspace/src/github.com/tendermint/tendermint/rpc/core/accounts.go
index 47dc8889f5f1ed557e9568c4634fecd58354d3e6..6918d8325a978ff699e9ddc75e6d83f9f80edbb9 100644
--- a/Godeps/_workspace/src/github.com/tendermint/tendermint/rpc/core/accounts.go
+++ b/Godeps/_workspace/src/github.com/tendermint/tendermint/rpc/core/accounts.go
@@ -2,9 +2,9 @@ package core
 
 import (
 	"fmt"
-	acm "github.com/tendermint/tendermint/account"
-	. "github.com/tendermint/tendermint/common"
-	ctypes "github.com/tendermint/tendermint/rpc/core/types"
+	acm "github.com/eris-ltd/eris-db/Godeps/_workspace/src/github.com/tendermint/tendermint/account"
+	. "github.com/eris-ltd/eris-db/Godeps/_workspace/src/github.com/tendermint/tendermint/common"
+	ctypes "github.com/eris-ltd/eris-db/Godeps/_workspace/src/github.com/tendermint/tendermint/rpc/core/types"
 )
 
 func GenPrivAccount() (*ctypes.ResultGenPrivAccount, error) {
diff --git a/Godeps/_workspace/src/github.com/tendermint/tendermint/rpc/core/blocks.go b/Godeps/_workspace/src/github.com/tendermint/tendermint/rpc/core/blocks.go
index 427390a2b36945a90a80533bc4bdfe09d12b7f03..fffe358d594be4ccfe6a7383fe520b4649182241 100644
--- a/Godeps/_workspace/src/github.com/tendermint/tendermint/rpc/core/blocks.go
+++ b/Godeps/_workspace/src/github.com/tendermint/tendermint/rpc/core/blocks.go
@@ -2,9 +2,9 @@ package core
 
 import (
 	"fmt"
-	. "github.com/tendermint/tendermint/common"
-	ctypes "github.com/tendermint/tendermint/rpc/core/types"
-	"github.com/tendermint/tendermint/types"
+	. "github.com/eris-ltd/eris-db/Godeps/_workspace/src/github.com/tendermint/tendermint/common"
+	ctypes "github.com/eris-ltd/eris-db/Godeps/_workspace/src/github.com/tendermint/tendermint/rpc/core/types"
+	"github.com/eris-ltd/eris-db/Godeps/_workspace/src/github.com/tendermint/tendermint/types"
 )
 
 //-----------------------------------------------------------------------------
diff --git a/Godeps/_workspace/src/github.com/tendermint/tendermint/rpc/core/config.go b/Godeps/_workspace/src/github.com/tendermint/tendermint/rpc/core/config.go
index c2593d5b55baad2cec577108e4eeacd6819ed567..9fb3f95421e60b84cae5d83ce7781e7215d2be5d 100644
--- a/Godeps/_workspace/src/github.com/tendermint/tendermint/rpc/core/config.go
+++ b/Godeps/_workspace/src/github.com/tendermint/tendermint/rpc/core/config.go
@@ -1,7 +1,7 @@
 package core
 
 import (
-	cfg "github.com/tendermint/tendermint/config"
+	cfg "github.com/eris-ltd/eris-db/Godeps/_workspace/src/github.com/tendermint/tendermint/config"
 )
 
 var config cfg.Config = nil
diff --git a/Godeps/_workspace/src/github.com/tendermint/tendermint/rpc/core/consensus.go b/Godeps/_workspace/src/github.com/tendermint/tendermint/rpc/core/consensus.go
index d6abcf72ff2e94656235820db5f43621da696689..d0f3a71e52bd4e7d1aac6f6a68769331137014c4 100644
--- a/Godeps/_workspace/src/github.com/tendermint/tendermint/rpc/core/consensus.go
+++ b/Godeps/_workspace/src/github.com/tendermint/tendermint/rpc/core/consensus.go
@@ -1,10 +1,10 @@
 package core
 
 import (
-	cm "github.com/tendermint/tendermint/consensus"
-	ctypes "github.com/tendermint/tendermint/rpc/core/types"
-	"github.com/tendermint/tendermint/types"
-	"github.com/tendermint/tendermint/wire"
+	cm "github.com/eris-ltd/eris-db/Godeps/_workspace/src/github.com/tendermint/tendermint/consensus"
+	ctypes "github.com/eris-ltd/eris-db/Godeps/_workspace/src/github.com/tendermint/tendermint/rpc/core/types"
+	"github.com/eris-ltd/eris-db/Godeps/_workspace/src/github.com/tendermint/tendermint/types"
+	"github.com/eris-ltd/eris-db/Godeps/_workspace/src/github.com/tendermint/tendermint/wire"
 )
 
 func ListValidators() (*ctypes.ResultListValidators, error) {
diff --git a/Godeps/_workspace/src/github.com/tendermint/tendermint/rpc/core/log.go b/Godeps/_workspace/src/github.com/tendermint/tendermint/rpc/core/log.go
index d359bee26498b53017a9aec516a65f6e2472d726..a0dfe3d8642abca18b02ca7e220b57da4840705d 100644
--- a/Godeps/_workspace/src/github.com/tendermint/tendermint/rpc/core/log.go
+++ b/Godeps/_workspace/src/github.com/tendermint/tendermint/rpc/core/log.go
@@ -1,7 +1,7 @@
 package core
 
 import (
-	"github.com/tendermint/log15"
+	"github.com/eris-ltd/eris-db/Godeps/_workspace/src/github.com/tendermint/log15"
 )
 
 var log = log15.New("module", "rpc")
diff --git a/Godeps/_workspace/src/github.com/tendermint/tendermint/rpc/core/mempool.go b/Godeps/_workspace/src/github.com/tendermint/tendermint/rpc/core/mempool.go
index eaf1d5c68ec5b84d51279c8e006a2aa20b0aff34..61cd4b95ed0e592c09531515e7370db77e9c0039 100644
--- a/Godeps/_workspace/src/github.com/tendermint/tendermint/rpc/core/mempool.go
+++ b/Godeps/_workspace/src/github.com/tendermint/tendermint/rpc/core/mempool.go
@@ -2,9 +2,9 @@ package core
 
 import (
 	"fmt"
-	ctypes "github.com/tendermint/tendermint/rpc/core/types"
-	"github.com/tendermint/tendermint/state"
-	"github.com/tendermint/tendermint/types"
+	ctypes "github.com/eris-ltd/eris-db/Godeps/_workspace/src/github.com/tendermint/tendermint/rpc/core/types"
+	"github.com/eris-ltd/eris-db/Godeps/_workspace/src/github.com/tendermint/tendermint/state"
+	"github.com/eris-ltd/eris-db/Godeps/_workspace/src/github.com/tendermint/tendermint/types"
 )
 
 //-----------------------------------------------------------------------------
diff --git a/Godeps/_workspace/src/github.com/tendermint/tendermint/rpc/core/names.go b/Godeps/_workspace/src/github.com/tendermint/tendermint/rpc/core/names.go
index 318beaafc4447579fd829852a66a44580200d607..b7a3dc6a619572d7bd30789073751e9348f981f7 100644
--- a/Godeps/_workspace/src/github.com/tendermint/tendermint/rpc/core/names.go
+++ b/Godeps/_workspace/src/github.com/tendermint/tendermint/rpc/core/names.go
@@ -3,8 +3,8 @@ package core
 import (
 	"fmt"
 
-	ctypes "github.com/tendermint/tendermint/rpc/core/types"
-	"github.com/tendermint/tendermint/types"
+	ctypes "github.com/eris-ltd/eris-db/Godeps/_workspace/src/github.com/tendermint/tendermint/rpc/core/types"
+	"github.com/eris-ltd/eris-db/Godeps/_workspace/src/github.com/tendermint/tendermint/types"
 )
 
 func GetName(name string) (*ctypes.ResultGetName, error) {
diff --git a/Godeps/_workspace/src/github.com/tendermint/tendermint/rpc/core/net.go b/Godeps/_workspace/src/github.com/tendermint/tendermint/rpc/core/net.go
index 7ce50312a5a22c0b651334dc781be9dc281c35c5..248600b059e5728cbab758059f7ddb47f31a4b35 100644
--- a/Godeps/_workspace/src/github.com/tendermint/tendermint/rpc/core/net.go
+++ b/Godeps/_workspace/src/github.com/tendermint/tendermint/rpc/core/net.go
@@ -1,10 +1,10 @@
 package core
 
 import (
-	dbm "github.com/tendermint/tendermint/db"
-	ctypes "github.com/tendermint/tendermint/rpc/core/types"
-	sm "github.com/tendermint/tendermint/state"
-	"github.com/tendermint/tendermint/types"
+	dbm "github.com/eris-ltd/eris-db/Godeps/_workspace/src/github.com/tendermint/tendermint/db"
+	ctypes "github.com/eris-ltd/eris-db/Godeps/_workspace/src/github.com/tendermint/tendermint/rpc/core/types"
+	sm "github.com/eris-ltd/eris-db/Godeps/_workspace/src/github.com/tendermint/tendermint/state"
+	"github.com/eris-ltd/eris-db/Godeps/_workspace/src/github.com/tendermint/tendermint/types"
 )
 
 //-----------------------------------------------------------------------------
diff --git a/Godeps/_workspace/src/github.com/tendermint/tendermint/rpc/core/pipe.go b/Godeps/_workspace/src/github.com/tendermint/tendermint/rpc/core/pipe.go
index 1cad8013e89bdd1a1059f03ac8115dc926e2b803..c2250cf1d614e6f020dbd2b216e16f7eaea85d63 100644
--- a/Godeps/_workspace/src/github.com/tendermint/tendermint/rpc/core/pipe.go
+++ b/Godeps/_workspace/src/github.com/tendermint/tendermint/rpc/core/pipe.go
@@ -1,12 +1,12 @@
 package core
 
 import (
-	bc "github.com/tendermint/tendermint/blockchain"
-	"github.com/tendermint/tendermint/consensus"
-	mempl "github.com/tendermint/tendermint/mempool"
-	"github.com/tendermint/tendermint/p2p"
-	stypes "github.com/tendermint/tendermint/state/types"
-	"github.com/tendermint/tendermint/types"
+	bc "github.com/eris-ltd/eris-db/Godeps/_workspace/src/github.com/tendermint/tendermint/blockchain"
+	"github.com/eris-ltd/eris-db/Godeps/_workspace/src/github.com/tendermint/tendermint/consensus"
+	mempl "github.com/eris-ltd/eris-db/Godeps/_workspace/src/github.com/tendermint/tendermint/mempool"
+	"github.com/eris-ltd/eris-db/Godeps/_workspace/src/github.com/tendermint/tendermint/p2p"
+	stypes "github.com/eris-ltd/eris-db/Godeps/_workspace/src/github.com/tendermint/tendermint/state/types"
+	"github.com/eris-ltd/eris-db/Godeps/_workspace/src/github.com/tendermint/tendermint/types"
 )
 
 var blockStore *bc.BlockStore
diff --git a/Godeps/_workspace/src/github.com/tendermint/tendermint/rpc/core/routes.go b/Godeps/_workspace/src/github.com/tendermint/tendermint/rpc/core/routes.go
index afc9586ae9f451d9014b36f8e8dae3b6e5d826b5..af7687abf5526c3eb3646e2b4d21e90385183061 100644
--- a/Godeps/_workspace/src/github.com/tendermint/tendermint/rpc/core/routes.go
+++ b/Godeps/_workspace/src/github.com/tendermint/tendermint/rpc/core/routes.go
@@ -1,7 +1,7 @@
 package core
 
 import (
-	rpc "github.com/tendermint/tendermint/rpc/server"
+	rpc "github.com/eris-ltd/eris-db/Godeps/_workspace/src/github.com/tendermint/tendermint/rpc/server"
 )
 
 // TODO: eliminate redundancy between here and reading code from core/
diff --git a/Godeps/_workspace/src/github.com/tendermint/tendermint/rpc/core/txs.go b/Godeps/_workspace/src/github.com/tendermint/tendermint/rpc/core/txs.go
index 073b6665cb3f6584126fbf4a6c9df73813b8d987..9e775e0adbba95b5b181847a143b7b8b4283d4b8 100644
--- a/Godeps/_workspace/src/github.com/tendermint/tendermint/rpc/core/txs.go
+++ b/Godeps/_workspace/src/github.com/tendermint/tendermint/rpc/core/txs.go
@@ -2,12 +2,12 @@ package core
 
 import (
 	"fmt"
-	acm "github.com/tendermint/tendermint/account"
-	. "github.com/tendermint/tendermint/common"
-	ctypes "github.com/tendermint/tendermint/rpc/core/types"
-	"github.com/tendermint/tendermint/state"
-	"github.com/tendermint/tendermint/types"
-	"github.com/tendermint/tendermint/vm"
+	acm "github.com/eris-ltd/eris-db/Godeps/_workspace/src/github.com/tendermint/tendermint/account"
+	. "github.com/eris-ltd/eris-db/Godeps/_workspace/src/github.com/tendermint/tendermint/common"
+	ctypes "github.com/eris-ltd/eris-db/Godeps/_workspace/src/github.com/tendermint/tendermint/rpc/core/types"
+	"github.com/eris-ltd/eris-db/Godeps/_workspace/src/github.com/tendermint/tendermint/state"
+	"github.com/eris-ltd/eris-db/Godeps/_workspace/src/github.com/tendermint/tendermint/types"
+	"github.com/eris-ltd/eris-db/Godeps/_workspace/src/github.com/tendermint/tendermint/vm"
 )
 
 func toVMAccount(acc *acm.Account) *vm.Account {
diff --git a/Godeps/_workspace/src/github.com/tendermint/tendermint/rpc/core/types/responses.go b/Godeps/_workspace/src/github.com/tendermint/tendermint/rpc/core/types/responses.go
index e756544c7f3eba48503d54ea0056c201cf493d63..bfc35523094de0ec21731046fac236a28fc845d3 100644
--- a/Godeps/_workspace/src/github.com/tendermint/tendermint/rpc/core/types/responses.go
+++ b/Godeps/_workspace/src/github.com/tendermint/tendermint/rpc/core/types/responses.go
@@ -1,10 +1,10 @@
 package core_types
 
 import (
-	acm "github.com/tendermint/tendermint/account"
-	stypes "github.com/tendermint/tendermint/state/types"
-	"github.com/tendermint/tendermint/types"
-	"github.com/tendermint/tendermint/wire"
+	acm "github.com/eris-ltd/eris-db/Godeps/_workspace/src/github.com/tendermint/tendermint/account"
+	stypes "github.com/eris-ltd/eris-db/Godeps/_workspace/src/github.com/tendermint/tendermint/state/types"
+	"github.com/eris-ltd/eris-db/Godeps/_workspace/src/github.com/tendermint/tendermint/types"
+	"github.com/eris-ltd/eris-db/Godeps/_workspace/src/github.com/tendermint/tendermint/wire"
 )
 
 type ResultGetStorage struct {
diff --git a/Godeps/_workspace/src/github.com/tendermint/tendermint/rpc/core_client/client.go b/Godeps/_workspace/src/github.com/tendermint/tendermint/rpc/core_client/client.go
index c2417248338a8023ea902ac52dcf67ee7dee311b..f8c76c5eddc7d8406c4ab53dc3618301de0a6c64 100644
--- a/Godeps/_workspace/src/github.com/tendermint/tendermint/rpc/core_client/client.go
+++ b/Godeps/_workspace/src/github.com/tendermint/tendermint/rpc/core_client/client.go
@@ -3,9 +3,9 @@ package core_client
 import (
 	"bytes"
 	"fmt"
-	ctypes "github.com/tendermint/tendermint/rpc/core/types"
-	rpctypes "github.com/tendermint/tendermint/rpc/types"
-	"github.com/tendermint/tendermint/wire"
+	ctypes "github.com/eris-ltd/eris-db/Godeps/_workspace/src/github.com/tendermint/tendermint/rpc/core/types"
+	rpctypes "github.com/eris-ltd/eris-db/Godeps/_workspace/src/github.com/tendermint/tendermint/rpc/types"
+	"github.com/eris-ltd/eris-db/Godeps/_workspace/src/github.com/tendermint/tendermint/wire"
 	"io/ioutil"
 	"net/http"
 	"net/url"
diff --git a/Godeps/_workspace/src/github.com/tendermint/tendermint/rpc/core_client/client_methods.go b/Godeps/_workspace/src/github.com/tendermint/tendermint/rpc/core_client/client_methods.go
index 29c2ac539f9404c4dea84b83760b6121184ce861..4d37cfcb1ffceb6b86b1bfc533cff249890632c4 100644
--- a/Godeps/_workspace/src/github.com/tendermint/tendermint/rpc/core_client/client_methods.go
+++ b/Godeps/_workspace/src/github.com/tendermint/tendermint/rpc/core_client/client_methods.go
@@ -4,10 +4,10 @@ package core_client
 
 import (
 	"fmt"
-	acm "github.com/tendermint/tendermint/account"
-	ctypes "github.com/tendermint/tendermint/rpc/core/types"
-	rpctypes "github.com/tendermint/tendermint/rpc/types"
-	"github.com/tendermint/tendermint/types"
+	acm "github.com/eris-ltd/eris-db/Godeps/_workspace/src/github.com/tendermint/tendermint/account"
+	ctypes "github.com/eris-ltd/eris-db/Godeps/_workspace/src/github.com/tendermint/tendermint/rpc/core/types"
+	rpctypes "github.com/eris-ltd/eris-db/Godeps/_workspace/src/github.com/tendermint/tendermint/rpc/types"
+	"github.com/eris-ltd/eris-db/Godeps/_workspace/src/github.com/tendermint/tendermint/types"
 	"io/ioutil"
 	"net/http"
 )
diff --git a/Godeps/_workspace/src/github.com/tendermint/tendermint/rpc/core_client/log.go b/Godeps/_workspace/src/github.com/tendermint/tendermint/rpc/core_client/log.go
index 54b638dc1eafc6095f18e05e47ee64dc6bbd9fd8..91c5ec3b95994acb808d195da4647ffdc6f61cff 100644
--- a/Godeps/_workspace/src/github.com/tendermint/tendermint/rpc/core_client/log.go
+++ b/Godeps/_workspace/src/github.com/tendermint/tendermint/rpc/core_client/log.go
@@ -1,7 +1,7 @@
 package core_client
 
 import (
-	"github.com/tendermint/log15"
+	"github.com/eris-ltd/eris-db/Godeps/_workspace/src/github.com/tendermint/log15"
 )
 
 var log = log15.New("module", "core_client")
diff --git a/Godeps/_workspace/src/github.com/tendermint/tendermint/rpc/core_client/ws_client.go b/Godeps/_workspace/src/github.com/tendermint/tendermint/rpc/core_client/ws_client.go
index 12fb86eb7f65c6c92aee8446e29cb8e41e86a51c..2ca57bc7b9b8eaa4bbd6b3188f507861486b06bd 100644
--- a/Godeps/_workspace/src/github.com/tendermint/tendermint/rpc/core_client/ws_client.go
+++ b/Godeps/_workspace/src/github.com/tendermint/tendermint/rpc/core_client/ws_client.go
@@ -5,11 +5,11 @@ import (
 	"strings"
 	"time"
 
-	"github.comgorilla/websocket"
-	. "github.com/tendermint/tendermint/common"
-	ctypes "github.com/tendermint/tendermint/rpc/core/types"
-	"github.com/tendermint/tendermint/rpc/types"
-	"github.com/tendermint/tendermint/wire"
+	. "github.com/eris-ltd/eris-db/Godeps/_workspace/src/github.com/tendermint/tendermint/common"
+	ctypes "github.com/eris-ltd/eris-db/Godeps/_workspace/src/github.com/tendermint/tendermint/rpc/core/types"
+	"github.com/eris-ltd/eris-db/Godeps/_workspace/src/github.com/tendermint/tendermint/rpc/types"
+	"github.com/eris-ltd/eris-db/Godeps/_workspace/src/github.com/tendermint/tendermint/wire"
+	"github.com/gorilla/websocket"
 )
 
 const (
diff --git a/Godeps/_workspace/src/github.com/tendermint/tendermint/rpc/server/handlers.go b/Godeps/_workspace/src/github.com/tendermint/tendermint/rpc/server/handlers.go
index 6a0826a1e75ad7ba356bae8c4a148e0042dbd665..51473b2def1705a142eb6d0fddc6ed0e26803d11 100644
--- a/Godeps/_workspace/src/github.com/tendermint/tendermint/rpc/server/handlers.go
+++ b/Godeps/_workspace/src/github.com/tendermint/tendermint/rpc/server/handlers.go
@@ -11,13 +11,13 @@ import (
 	"sort"
 	"time"
 
-	"github.comgorilla/websocket"
-	. "github.com/tendermint/tendermint/common"
-	"github.com/tendermint/tendermint/events"
-	ctypes "github.com/tendermint/tendermint/rpc/core/types"
-	. "github.com/tendermint/tendermint/rpc/types"
-	"github.com/tendermint/tendermint/types"
-	"github.com/tendermint/tendermint/wire"
+	. "github.com/eris-ltd/eris-db/Godeps/_workspace/src/github.com/tendermint/tendermint/common"
+	"github.com/eris-ltd/eris-db/Godeps/_workspace/src/github.com/tendermint/tendermint/events"
+	ctypes "github.com/eris-ltd/eris-db/Godeps/_workspace/src/github.com/tendermint/tendermint/rpc/core/types"
+	. "github.com/eris-ltd/eris-db/Godeps/_workspace/src/github.com/tendermint/tendermint/rpc/types"
+	"github.com/eris-ltd/eris-db/Godeps/_workspace/src/github.com/tendermint/tendermint/types"
+	"github.com/eris-ltd/eris-db/Godeps/_workspace/src/github.com/tendermint/tendermint/wire"
+	"github.com/gorilla/websocket"
 )
 
 func RegisterRPCFuncs(mux *http.ServeMux, funcMap map[string]*RPCFunc) {
diff --git a/Godeps/_workspace/src/github.com/tendermint/tendermint/rpc/server/http_server.go b/Godeps/_workspace/src/github.com/tendermint/tendermint/rpc/server/http_server.go
index 16f6a9651685aa634dc08bd621b75c354498f9e0..bf55baedb22cfd37c0e5a1b349565874df2df37b 100644
--- a/Godeps/_workspace/src/github.com/tendermint/tendermint/rpc/server/http_server.go
+++ b/Godeps/_workspace/src/github.com/tendermint/tendermint/rpc/server/http_server.go
@@ -10,10 +10,10 @@ import (
 	"runtime/debug"
 	"time"
 
-	"github.com/tendermint/tendermint/alert"
-	. "github.com/tendermint/tendermint/common"
-	. "github.com/tendermint/tendermint/rpc/types"
-	"github.com/tendermint/tendermint/wire"
+	"github.com/eris-ltd/eris-db/Godeps/_workspace/src/github.com/tendermint/tendermint/alert"
+	. "github.com/eris-ltd/eris-db/Godeps/_workspace/src/github.com/tendermint/tendermint/common"
+	. "github.com/eris-ltd/eris-db/Godeps/_workspace/src/github.com/tendermint/tendermint/rpc/types"
+	"github.com/eris-ltd/eris-db/Godeps/_workspace/src/github.com/tendermint/tendermint/wire"
 )
 
 func StartHTTPServer(listenAddr string, handler http.Handler) (net.Listener, error) {
diff --git a/Godeps/_workspace/src/github.com/tendermint/tendermint/rpc/server/log.go b/Godeps/_workspace/src/github.com/tendermint/tendermint/rpc/server/log.go
index 704e22e303fefe2ebb02575e0e4524084640d005..aab9721fd941db6ddd8080281ef57372b8f4d17e 100644
--- a/Godeps/_workspace/src/github.com/tendermint/tendermint/rpc/server/log.go
+++ b/Godeps/_workspace/src/github.com/tendermint/tendermint/rpc/server/log.go
@@ -1,7 +1,7 @@
 package rpcserver
 
 import (
-	"github.com/tendermint/log15"
+	"github.com/eris-ltd/eris-db/Godeps/_workspace/src/github.com/tendermint/log15"
 )
 
 var log = log15.New("module", "rpcserver")
diff --git a/Godeps/_workspace/src/github.com/tendermint/tendermint/rpc/test/client_rpc_test.go b/Godeps/_workspace/src/github.com/tendermint/tendermint/rpc/test/client_rpc_test.go
index 4b5e6d1e3ab61a03f0a55b57b3ef8a4b1b44fc2d..c773330c7f134cdb7e85a61ef48859dc29231140 100644
--- a/Godeps/_workspace/src/github.com/tendermint/tendermint/rpc/test/client_rpc_test.go
+++ b/Godeps/_workspace/src/github.com/tendermint/tendermint/rpc/test/client_rpc_test.go
@@ -1,7 +1,7 @@
 package rpctest
 
 import (
-	_ "github.com/tendermint/tendermint/config/tendermint_test"
+	_ "github.com/eris-ltd/eris-db/Godeps/_workspace/src/github.com/tendermint/tendermint/config/tendermint_test"
 	"testing"
 )
 
diff --git a/Godeps/_workspace/src/github.com/tendermint/tendermint/rpc/test/client_ws_test.go b/Godeps/_workspace/src/github.com/tendermint/tendermint/rpc/test/client_ws_test.go
index 991764848866e5a2004ab765ecb93649d1e646bd..7d8575eb3751d2d9d41767d38fa364bdf31dc02f 100644
--- a/Godeps/_workspace/src/github.com/tendermint/tendermint/rpc/test/client_ws_test.go
+++ b/Godeps/_workspace/src/github.com/tendermint/tendermint/rpc/test/client_ws_test.go
@@ -4,8 +4,8 @@ import (
 	"fmt"
 	"testing"
 
-	_ "github.com/tendermint/tendermint/config/tendermint_test"
-	"github.com/tendermint/tendermint/types"
+	_ "github.com/eris-ltd/eris-db/Godeps/_workspace/src/github.com/tendermint/tendermint/config/tendermint_test"
+	"github.com/eris-ltd/eris-db/Godeps/_workspace/src/github.com/tendermint/tendermint/types"
 )
 
 var wsTyp = "JSONRPC"
diff --git a/Godeps/_workspace/src/github.com/tendermint/tendermint/rpc/test/config.go b/Godeps/_workspace/src/github.com/tendermint/tendermint/rpc/test/config.go
index ef5d54339dcad7ab3459e78c1edc150a095eb63f..51c8f87c4e3fd2102d771149eea48103b181b9e2 100644
--- a/Godeps/_workspace/src/github.com/tendermint/tendermint/rpc/test/config.go
+++ b/Godeps/_workspace/src/github.com/tendermint/tendermint/rpc/test/config.go
@@ -1,7 +1,7 @@
 package rpctest
 
 import (
-	cfg "github.com/tendermint/tendermint/config"
+	cfg "github.com/eris-ltd/eris-db/Godeps/_workspace/src/github.com/tendermint/tendermint/config"
 )
 
 var config cfg.Config = nil
diff --git a/Godeps/_workspace/src/github.com/tendermint/tendermint/rpc/test/helpers.go b/Godeps/_workspace/src/github.com/tendermint/tendermint/rpc/test/helpers.go
index e49c3f08f7c4888ea20b5c4cc190eaa21823c586..53c69a9bfcfc11625f90d71575fc7ded3b0bb014 100644
--- a/Godeps/_workspace/src/github.com/tendermint/tendermint/rpc/test/helpers.go
+++ b/Godeps/_workspace/src/github.com/tendermint/tendermint/rpc/test/helpers.go
@@ -5,13 +5,13 @@ import (
 	"strconv"
 	"testing"
 
-	acm "github.com/tendermint/tendermint/account"
-	. "github.com/tendermint/tendermint/common"
-	nm "github.com/tendermint/tendermint/node"
-	"github.com/tendermint/tendermint/p2p"
-	ctypes "github.com/tendermint/tendermint/rpc/core/types"
-	cclient "github.com/tendermint/tendermint/rpc/core_client"
-	"github.com/tendermint/tendermint/types"
+	acm "github.com/eris-ltd/eris-db/Godeps/_workspace/src/github.com/tendermint/tendermint/account"
+	. "github.com/eris-ltd/eris-db/Godeps/_workspace/src/github.com/tendermint/tendermint/common"
+	nm "github.com/eris-ltd/eris-db/Godeps/_workspace/src/github.com/tendermint/tendermint/node"
+	"github.com/eris-ltd/eris-db/Godeps/_workspace/src/github.com/tendermint/tendermint/p2p"
+	ctypes "github.com/eris-ltd/eris-db/Godeps/_workspace/src/github.com/tendermint/tendermint/rpc/core/types"
+	cclient "github.com/eris-ltd/eris-db/Godeps/_workspace/src/github.com/tendermint/tendermint/rpc/core_client"
+	"github.com/eris-ltd/eris-db/Godeps/_workspace/src/github.com/tendermint/tendermint/types"
 )
 
 // global variables for use across all tests
diff --git a/Godeps/_workspace/src/github.com/tendermint/tendermint/rpc/test/tests.go b/Godeps/_workspace/src/github.com/tendermint/tendermint/rpc/test/tests.go
index e684bbef339b23236cfc230903a665af475009ec..f08bc6db349e138a49cea2e428fbad6388b00df9 100644
--- a/Godeps/_workspace/src/github.com/tendermint/tendermint/rpc/test/tests.go
+++ b/Godeps/_workspace/src/github.com/tendermint/tendermint/rpc/test/tests.go
@@ -3,8 +3,8 @@ package rpctest
 import (
 	"bytes"
 	"fmt"
-	. "github.com/tendermint/tendermint/common"
-	"github.com/tendermint/tendermint/types"
+	. "github.com/eris-ltd/eris-db/Godeps/_workspace/src/github.com/tendermint/tendermint/common"
+	"github.com/eris-ltd/eris-db/Godeps/_workspace/src/github.com/tendermint/tendermint/types"
 	"testing"
 )
 
diff --git a/Godeps/_workspace/src/github.com/tendermint/tendermint/rpc/test/ws_helpers.go b/Godeps/_workspace/src/github.com/tendermint/tendermint/rpc/test/ws_helpers.go
index 10e9c3a24fcd535c6615a9635ae753b04f1c5341..fce8b1332b40cb1891dbde38ad84a32cd0196c09 100644
--- a/Godeps/_workspace/src/github.com/tendermint/tendermint/rpc/test/ws_helpers.go
+++ b/Godeps/_workspace/src/github.com/tendermint/tendermint/rpc/test/ws_helpers.go
@@ -7,12 +7,12 @@ import (
 	"testing"
 	"time"
 
-	"github.comgorilla/websocket"
-	_ "github.com/tendermint/tendermint/config/tendermint_test"
-	ctypes "github.com/tendermint/tendermint/rpc/core/types"
-	"github.com/tendermint/tendermint/rpc/types"
-	"github.com/tendermint/tendermint/types"
-	"github.com/tendermint/tendermint/wire"
+	_ "github.com/eris-ltd/eris-db/Godeps/_workspace/src/github.com/tendermint/tendermint/config/tendermint_test"
+	ctypes "github.com/eris-ltd/eris-db/Godeps/_workspace/src/github.com/tendermint/tendermint/rpc/core/types"
+	"github.com/eris-ltd/eris-db/Godeps/_workspace/src/github.com/tendermint/tendermint/rpc/types"
+	"github.com/eris-ltd/eris-db/Godeps/_workspace/src/github.com/tendermint/tendermint/types"
+	"github.com/eris-ltd/eris-db/Godeps/_workspace/src/github.com/tendermint/tendermint/wire"
+	"github.com/gorilla/websocket"
 )
 
 //--------------------------------------------------------------------------------
diff --git a/Godeps/_workspace/src/github.com/tendermint/tendermint/state/block_cache.go b/Godeps/_workspace/src/github.com/tendermint/tendermint/state/block_cache.go
index 0bbab6fa4ab471c33017e9bbfe79fab52a759080..0d0cb0fe8f152716d67b1ef1019cdcb125d6ec28 100644
--- a/Godeps/_workspace/src/github.com/tendermint/tendermint/state/block_cache.go
+++ b/Godeps/_workspace/src/github.com/tendermint/tendermint/state/block_cache.go
@@ -4,12 +4,12 @@ import (
 	"bytes"
 	"sort"
 
-	acm "github.com/tendermint/tendermint/account"
-	. "github.com/tendermint/tendermint/common"
-	dbm "github.com/tendermint/tendermint/db"
-	"github.com/tendermint/tendermint/merkle"
-	"github.com/tendermint/tendermint/types"
-	"github.com/tendermint/tendermint/wire"
+	acm "github.com/eris-ltd/eris-db/Godeps/_workspace/src/github.com/tendermint/tendermint/account"
+	. "github.com/eris-ltd/eris-db/Godeps/_workspace/src/github.com/tendermint/tendermint/common"
+	dbm "github.com/eris-ltd/eris-db/Godeps/_workspace/src/github.com/tendermint/tendermint/db"
+	"github.com/eris-ltd/eris-db/Godeps/_workspace/src/github.com/tendermint/tendermint/merkle"
+	"github.com/eris-ltd/eris-db/Godeps/_workspace/src/github.com/tendermint/tendermint/types"
+	"github.com/eris-ltd/eris-db/Godeps/_workspace/src/github.com/tendermint/tendermint/wire"
 )
 
 func makeStorage(db dbm.DB, root []byte) merkle.Tree {
diff --git a/Godeps/_workspace/src/github.com/tendermint/tendermint/state/common.go b/Godeps/_workspace/src/github.com/tendermint/tendermint/state/common.go
index 0adad0aa37cc3f6080f0f4555cf06a913fc203bd..bb0f91ed8e3d993504ea14d0694b62af4b3afa6a 100644
--- a/Godeps/_workspace/src/github.com/tendermint/tendermint/state/common.go
+++ b/Godeps/_workspace/src/github.com/tendermint/tendermint/state/common.go
@@ -1,9 +1,9 @@
 package state
 
 import (
-	acm "github.com/tendermint/tendermint/account"
-	. "github.com/tendermint/tendermint/common"
-	"github.com/tendermint/tendermint/vm"
+	acm "github.com/eris-ltd/eris-db/Godeps/_workspace/src/github.com/tendermint/tendermint/account"
+	. "github.com/eris-ltd/eris-db/Godeps/_workspace/src/github.com/tendermint/tendermint/common"
+	"github.com/eris-ltd/eris-db/Godeps/_workspace/src/github.com/tendermint/tendermint/vm"
 )
 
 type AccountGetter interface {
diff --git a/Godeps/_workspace/src/github.com/tendermint/tendermint/state/execution.go b/Godeps/_workspace/src/github.com/tendermint/tendermint/state/execution.go
index bdb858ab5c1fba3d9caa5a35ae02189ae1683c99..bf9b0558dc6f7a110f87eed2fd6933491f0df96e 100644
--- a/Godeps/_workspace/src/github.com/tendermint/tendermint/state/execution.go
+++ b/Godeps/_workspace/src/github.com/tendermint/tendermint/state/execution.go
@@ -5,12 +5,12 @@ import (
 	"errors"
 	"fmt"
 
-	acm "github.com/tendermint/tendermint/account"
-	. "github.com/tendermint/tendermint/common"
-	"github.com/tendermint/tendermint/events"
-	ptypes "github.com/tendermint/tendermint/permission/types" // for GlobalPermissionAddress ...
-	"github.com/tendermint/tendermint/types"
-	"github.com/tendermint/tendermint/vm"
+	acm "github.com/eris-ltd/eris-db/Godeps/_workspace/src/github.com/tendermint/tendermint/account"
+	. "github.com/eris-ltd/eris-db/Godeps/_workspace/src/github.com/tendermint/tendermint/common"
+	"github.com/eris-ltd/eris-db/Godeps/_workspace/src/github.com/tendermint/tendermint/events"
+	ptypes "github.com/eris-ltd/eris-db/Godeps/_workspace/src/github.com/tendermint/tendermint/permission/types" // for GlobalPermissionAddress ...
+	"github.com/eris-ltd/eris-db/Godeps/_workspace/src/github.com/tendermint/tendermint/types"
+	"github.com/eris-ltd/eris-db/Godeps/_workspace/src/github.com/tendermint/tendermint/vm"
 )
 
 // NOTE: If an error occurs during block execution, state will be left
diff --git a/Godeps/_workspace/src/github.com/tendermint/tendermint/state/genesis_test.go b/Godeps/_workspace/src/github.com/tendermint/tendermint/state/genesis_test.go
index dfa66339e877e3b702dcc212b7815e60947bd648..7c91436dc1bc7abf4db453a5b40a186db7c1dacb 100644
--- a/Godeps/_workspace/src/github.com/tendermint/tendermint/state/genesis_test.go
+++ b/Godeps/_workspace/src/github.com/tendermint/tendermint/state/genesis_test.go
@@ -6,9 +6,9 @@ import (
 	"fmt"
 	"testing"
 
-	tdb "github.com/tendermint/tendermint/db"
-	ptypes "github.com/tendermint/tendermint/permission/types"
-	. "github.com/tendermint/tendermint/state/types"
+	tdb "github.com/eris-ltd/eris-db/Godeps/_workspace/src/github.com/tendermint/tendermint/db"
+	ptypes "github.com/eris-ltd/eris-db/Godeps/_workspace/src/github.com/tendermint/tendermint/permission/types"
+	. "github.com/eris-ltd/eris-db/Godeps/_workspace/src/github.com/tendermint/tendermint/state/types"
 )
 
 var chain_id = "lone_ranger"
diff --git a/Godeps/_workspace/src/github.com/tendermint/tendermint/state/log.go b/Godeps/_workspace/src/github.com/tendermint/tendermint/state/log.go
index 7f1d3eba2ec3a4b4dc1bf8cdc2e4aadb160a9fc7..6b5410463299c30998e21d24bd065de6ce3a5495 100644
--- a/Godeps/_workspace/src/github.com/tendermint/tendermint/state/log.go
+++ b/Godeps/_workspace/src/github.com/tendermint/tendermint/state/log.go
@@ -1,7 +1,7 @@
 package state
 
 import (
-	"github.com/tendermint/tendermint/logger"
+	"github.com/eris-ltd/eris-db/Godeps/_workspace/src/github.com/tendermint/tendermint/logger"
 )
 
 var log = logger.New("module", "state")
diff --git a/Godeps/_workspace/src/github.com/tendermint/tendermint/state/permissions_test.go b/Godeps/_workspace/src/github.com/tendermint/tendermint/state/permissions_test.go
index 34dfc9e5d3dd27e6067532eb92e371788a5adc36..fcaf48d95a2c16cf10a2087bf7d2a543a5b15b08 100644
--- a/Godeps/_workspace/src/github.com/tendermint/tendermint/state/permissions_test.go
+++ b/Godeps/_workspace/src/github.com/tendermint/tendermint/state/permissions_test.go
@@ -7,13 +7,13 @@ import (
 	"testing"
 	"time"
 
-	acm "github.com/tendermint/tendermint/account"
-	. "github.com/tendermint/tendermint/common"
-	dbm "github.com/tendermint/tendermint/db"
-	"github.com/tendermint/tendermint/events"
-	ptypes "github.com/tendermint/tendermint/permission/types"
-	. "github.com/tendermint/tendermint/state/types"
-	"github.com/tendermint/tendermint/types"
+	acm "github.com/eris-ltd/eris-db/Godeps/_workspace/src/github.com/tendermint/tendermint/account"
+	. "github.com/eris-ltd/eris-db/Godeps/_workspace/src/github.com/tendermint/tendermint/common"
+	dbm "github.com/eris-ltd/eris-db/Godeps/_workspace/src/github.com/tendermint/tendermint/db"
+	"github.com/eris-ltd/eris-db/Godeps/_workspace/src/github.com/tendermint/tendermint/events"
+	ptypes "github.com/eris-ltd/eris-db/Godeps/_workspace/src/github.com/tendermint/tendermint/permission/types"
+	. "github.com/eris-ltd/eris-db/Godeps/_workspace/src/github.com/tendermint/tendermint/state/types"
+	"github.com/eris-ltd/eris-db/Godeps/_workspace/src/github.com/tendermint/tendermint/types"
 )
 
 /*
diff --git a/Godeps/_workspace/src/github.com/tendermint/tendermint/state/state.go b/Godeps/_workspace/src/github.com/tendermint/tendermint/state/state.go
index 20f6d134cc7ac71969ba75f5b075ee715dfabecc..4abbc242e6481bca9515cec4a7c6372d13e9d3e1 100644
--- a/Godeps/_workspace/src/github.com/tendermint/tendermint/state/state.go
+++ b/Godeps/_workspace/src/github.com/tendermint/tendermint/state/state.go
@@ -6,15 +6,15 @@ import (
 	"io/ioutil"
 	"time"
 
-	acm "github.com/tendermint/tendermint/account"
-	. "github.com/tendermint/tendermint/common"
-	dbm "github.com/tendermint/tendermint/db"
-	"github.com/tendermint/tendermint/events"
-	"github.com/tendermint/tendermint/merkle"
-	ptypes "github.com/tendermint/tendermint/permission/types"
-	. "github.com/tendermint/tendermint/state/types"
-	"github.com/tendermint/tendermint/types"
-	"github.com/tendermint/tendermint/wire"
+	acm "github.com/eris-ltd/eris-db/Godeps/_workspace/src/github.com/tendermint/tendermint/account"
+	. "github.com/eris-ltd/eris-db/Godeps/_workspace/src/github.com/tendermint/tendermint/common"
+	dbm "github.com/eris-ltd/eris-db/Godeps/_workspace/src/github.com/tendermint/tendermint/db"
+	"github.com/eris-ltd/eris-db/Godeps/_workspace/src/github.com/tendermint/tendermint/events"
+	"github.com/eris-ltd/eris-db/Godeps/_workspace/src/github.com/tendermint/tendermint/merkle"
+	ptypes "github.com/eris-ltd/eris-db/Godeps/_workspace/src/github.com/tendermint/tendermint/permission/types"
+	. "github.com/eris-ltd/eris-db/Godeps/_workspace/src/github.com/tendermint/tendermint/state/types"
+	"github.com/eris-ltd/eris-db/Godeps/_workspace/src/github.com/tendermint/tendermint/types"
+	"github.com/eris-ltd/eris-db/Godeps/_workspace/src/github.com/tendermint/tendermint/wire"
 )
 
 var (
diff --git a/Godeps/_workspace/src/github.com/tendermint/tendermint/state/state_test.go b/Godeps/_workspace/src/github.com/tendermint/tendermint/state/state_test.go
index c98aac82a9bd67b3bda6fe308998146fda707343..d030f31942fa75f5d650f97b828a221935fdcf01 100644
--- a/Godeps/_workspace/src/github.com/tendermint/tendermint/state/state_test.go
+++ b/Godeps/_workspace/src/github.com/tendermint/tendermint/state/state_test.go
@@ -5,9 +5,9 @@ import (
 	"testing"
 	"time"
 
-	"github.com/tendermint/tendermint/account"
-	_ "github.com/tendermint/tendermint/config/tendermint_test"
-	"github.com/tendermint/tendermint/types"
+	"github.com/eris-ltd/eris-db/Godeps/_workspace/src/github.com/tendermint/tendermint/account"
+	_ "github.com/eris-ltd/eris-db/Godeps/_workspace/src/github.com/tendermint/tendermint/config/tendermint_test"
+	"github.com/eris-ltd/eris-db/Godeps/_workspace/src/github.com/tendermint/tendermint/types"
 )
 
 func execTxWithState(state *State, tx types.Tx, runCall bool) error {
diff --git a/Godeps/_workspace/src/github.com/tendermint/tendermint/state/test.go b/Godeps/_workspace/src/github.com/tendermint/tendermint/state/test.go
index 90d5003d3d72a2e25211c8d4df66a22cf211e7b5..ca6eae68c62a593e0d0292a26d5edb59a7a604f3 100644
--- a/Godeps/_workspace/src/github.com/tendermint/tendermint/state/test.go
+++ b/Godeps/_workspace/src/github.com/tendermint/tendermint/state/test.go
@@ -4,12 +4,12 @@ import (
 	"sort"
 	"time"
 
-	acm "github.com/tendermint/tendermint/account"
-	. "github.com/tendermint/tendermint/common"
-	dbm "github.com/tendermint/tendermint/db"
-	ptypes "github.com/tendermint/tendermint/permission/types"
-	. "github.com/tendermint/tendermint/state/types"
-	"github.com/tendermint/tendermint/types"
+	acm "github.com/eris-ltd/eris-db/Godeps/_workspace/src/github.com/tendermint/tendermint/account"
+	. "github.com/eris-ltd/eris-db/Godeps/_workspace/src/github.com/tendermint/tendermint/common"
+	dbm "github.com/eris-ltd/eris-db/Godeps/_workspace/src/github.com/tendermint/tendermint/db"
+	ptypes "github.com/eris-ltd/eris-db/Godeps/_workspace/src/github.com/tendermint/tendermint/permission/types"
+	. "github.com/eris-ltd/eris-db/Godeps/_workspace/src/github.com/tendermint/tendermint/state/types"
+	"github.com/eris-ltd/eris-db/Godeps/_workspace/src/github.com/tendermint/tendermint/types"
 )
 
 func RandAccount(randBalance bool, minBalance int64) (*acm.Account, *acm.PrivAccount) {
diff --git a/Godeps/_workspace/src/github.com/tendermint/tendermint/state/tx_cache.go b/Godeps/_workspace/src/github.com/tendermint/tendermint/state/tx_cache.go
index 8afd1cd0a750b780aca9be75218265584c18669e..532bb896c60ca860b088d861985ae7d95253c779 100644
--- a/Godeps/_workspace/src/github.com/tendermint/tendermint/state/tx_cache.go
+++ b/Godeps/_workspace/src/github.com/tendermint/tendermint/state/tx_cache.go
@@ -1,11 +1,11 @@
 package state
 
 import (
-	acm "github.com/tendermint/tendermint/account"
-	. "github.com/tendermint/tendermint/common"
-	ptypes "github.com/tendermint/tendermint/permission/types" // for GlobalPermissionAddress ...
-	"github.com/tendermint/tendermint/types"
-	"github.com/tendermint/tendermint/vm"
+	acm "github.com/eris-ltd/eris-db/Godeps/_workspace/src/github.com/tendermint/tendermint/account"
+	. "github.com/eris-ltd/eris-db/Godeps/_workspace/src/github.com/tendermint/tendermint/common"
+	ptypes "github.com/eris-ltd/eris-db/Godeps/_workspace/src/github.com/tendermint/tendermint/permission/types" // for GlobalPermissionAddress ...
+	"github.com/eris-ltd/eris-db/Godeps/_workspace/src/github.com/tendermint/tendermint/types"
+	"github.com/eris-ltd/eris-db/Godeps/_workspace/src/github.com/tendermint/tendermint/vm"
 )
 
 type TxCache struct {
diff --git a/Godeps/_workspace/src/github.com/tendermint/tendermint/state/tx_cache_test.go b/Godeps/_workspace/src/github.com/tendermint/tendermint/state/tx_cache_test.go
index c1a2d057121ded42b20bf7dad63a22037f2e001c..ef6544925948eab6ddaad9b681f4331bf2454cfa 100644
--- a/Godeps/_workspace/src/github.com/tendermint/tendermint/state/tx_cache_test.go
+++ b/Godeps/_workspace/src/github.com/tendermint/tendermint/state/tx_cache_test.go
@@ -4,7 +4,7 @@ import (
 	"bytes"
 	"testing"
 
-	"github.com/tendermint/tendermint/wire"
+	"github.com/eris-ltd/eris-db/Godeps/_workspace/src/github.com/tendermint/tendermint/wire"
 )
 
 func TestStateToFromVMAccount(t *testing.T) {
diff --git a/Godeps/_workspace/src/github.com/tendermint/tendermint/state/types/genesis.go b/Godeps/_workspace/src/github.com/tendermint/tendermint/state/types/genesis.go
index c956286fb510df618dbf66fc589cc9f2d49f65f1..ed90b01bf6623ac4079194db7876d513480b9aef 100644
--- a/Godeps/_workspace/src/github.com/tendermint/tendermint/state/types/genesis.go
+++ b/Godeps/_workspace/src/github.com/tendermint/tendermint/state/types/genesis.go
@@ -3,10 +3,10 @@ package types
 import (
 	"time"
 
-	acm "github.com/tendermint/tendermint/account"
-	. "github.com/tendermint/tendermint/common"
-	ptypes "github.com/tendermint/tendermint/permission/types"
-	"github.com/tendermint/tendermint/wire"
+	acm "github.com/eris-ltd/eris-db/Godeps/_workspace/src/github.com/tendermint/tendermint/account"
+	. "github.com/eris-ltd/eris-db/Godeps/_workspace/src/github.com/tendermint/tendermint/common"
+	ptypes "github.com/eris-ltd/eris-db/Godeps/_workspace/src/github.com/tendermint/tendermint/permission/types"
+	"github.com/eris-ltd/eris-db/Godeps/_workspace/src/github.com/tendermint/tendermint/wire"
 )
 
 //------------------------------------------------------------
diff --git a/Godeps/_workspace/src/github.com/tendermint/tendermint/types/block.go b/Godeps/_workspace/src/github.com/tendermint/tendermint/types/block.go
index 718b6a5a5963e541964aca901c1d78cf6613ff45..7750f97856021762f097e73fd583634aaa53d8e3 100644
--- a/Godeps/_workspace/src/github.com/tendermint/tendermint/types/block.go
+++ b/Godeps/_workspace/src/github.com/tendermint/tendermint/types/block.go
@@ -7,10 +7,10 @@ import (
 	"strings"
 	"time"
 
-	acm "github.com/tendermint/tendermint/account"
-	. "github.com/tendermint/tendermint/common"
-	"github.com/tendermint/tendermint/merkle"
-	"github.com/tendermint/tendermint/wire"
+	acm "github.com/eris-ltd/eris-db/Godeps/_workspace/src/github.com/tendermint/tendermint/account"
+	. "github.com/eris-ltd/eris-db/Godeps/_workspace/src/github.com/tendermint/tendermint/common"
+	"github.com/eris-ltd/eris-db/Godeps/_workspace/src/github.com/tendermint/tendermint/merkle"
+	"github.com/eris-ltd/eris-db/Godeps/_workspace/src/github.com/tendermint/tendermint/wire"
 )
 
 type Block struct {
diff --git a/Godeps/_workspace/src/github.com/tendermint/tendermint/types/config.go b/Godeps/_workspace/src/github.com/tendermint/tendermint/types/config.go
index 915778ddc99c5cd40cc0adf3c9d4c92213a05082..14a0192943111918cc56f8a9ddfc07d77117ef98 100644
--- a/Godeps/_workspace/src/github.com/tendermint/tendermint/types/config.go
+++ b/Godeps/_workspace/src/github.com/tendermint/tendermint/types/config.go
@@ -1,7 +1,7 @@
 package types
 
 import (
-	cfg "github.com/tendermint/tendermint/config"
+	cfg "github.com/eris-ltd/eris-db/Godeps/_workspace/src/github.com/tendermint/tendermint/config"
 )
 
 var config cfg.Config = nil
diff --git a/Godeps/_workspace/src/github.com/tendermint/tendermint/types/events.go b/Godeps/_workspace/src/github.com/tendermint/tendermint/types/events.go
index 5d717734e439e6f3c32ad1ceaf48b95f00a3fb30..8ce11fabd92deff82351f99a1bb12aaba2c18c3c 100644
--- a/Godeps/_workspace/src/github.com/tendermint/tendermint/types/events.go
+++ b/Godeps/_workspace/src/github.com/tendermint/tendermint/types/events.go
@@ -4,8 +4,8 @@ import (
 	"fmt"
 	"time"
 
-	. "github.com/tendermint/tendermint/common"
-	"github.com/tendermint/tendermint/wire"
+	. "github.com/eris-ltd/eris-db/Godeps/_workspace/src/github.com/tendermint/tendermint/common"
+	"github.com/eris-ltd/eris-db/Godeps/_workspace/src/github.com/tendermint/tendermint/wire"
 )
 
 // Functions to generate eventId strings
diff --git a/Godeps/_workspace/src/github.com/tendermint/tendermint/types/log.go b/Godeps/_workspace/src/github.com/tendermint/tendermint/types/log.go
index fed0c559fa7ff25625c315bf679966548bb85873..19855efc303c5f7c40cb0d67ee8c6ea57ac18fef 100644
--- a/Godeps/_workspace/src/github.com/tendermint/tendermint/types/log.go
+++ b/Godeps/_workspace/src/github.com/tendermint/tendermint/types/log.go
@@ -1,7 +1,7 @@
 package types
 
 import (
-	"github.com/tendermint/tendermint/logger"
+	"github.com/eris-ltd/eris-db/Godeps/_workspace/src/github.com/tendermint/tendermint/logger"
 )
 
 var log = logger.New("module", "types")
diff --git a/Godeps/_workspace/src/github.com/tendermint/tendermint/types/node.go b/Godeps/_workspace/src/github.com/tendermint/tendermint/types/node.go
index bf63507434305659ea3ac3e86a69756ee029c0cb..e548a5779c46c7e2515bd67355705f4ee9613250 100644
--- a/Godeps/_workspace/src/github.com/tendermint/tendermint/types/node.go
+++ b/Godeps/_workspace/src/github.com/tendermint/tendermint/types/node.go
@@ -2,7 +2,7 @@ package types
 
 import (
 	"fmt"
-	acm "github.com/tendermint/tendermint/account"
+	acm "github.com/eris-ltd/eris-db/Godeps/_workspace/src/github.com/tendermint/tendermint/account"
 	"strings"
 )
 
diff --git a/Godeps/_workspace/src/github.com/tendermint/tendermint/types/part_set.go b/Godeps/_workspace/src/github.com/tendermint/tendermint/types/part_set.go
index f5fcb98f3a09bb1a88b8de6dc2dfc9863cd71c07..439da4835b675e348623714bb0438754b8adc662 100644
--- a/Godeps/_workspace/src/github.com/tendermint/tendermint/types/part_set.go
+++ b/Godeps/_workspace/src/github.com/tendermint/tendermint/types/part_set.go
@@ -9,9 +9,9 @@ import (
 
 	"github.com/eris-ltd/eris-db/Godeps/_workspace/src/code.google.com/p/go.crypto/ripemd160"
 
-	. "github.com/tendermint/tendermint/common"
-	"github.com/tendermint/tendermint/merkle"
-	"github.com/tendermint/tendermint/wire"
+	. "github.com/eris-ltd/eris-db/Godeps/_workspace/src/github.com/tendermint/tendermint/common"
+	"github.com/eris-ltd/eris-db/Godeps/_workspace/src/github.com/tendermint/tendermint/merkle"
+	"github.com/eris-ltd/eris-db/Godeps/_workspace/src/github.com/tendermint/tendermint/wire"
 )
 
 const (
diff --git a/Godeps/_workspace/src/github.com/tendermint/tendermint/types/part_set_test.go b/Godeps/_workspace/src/github.com/tendermint/tendermint/types/part_set_test.go
index 5d2d9142ba3ee36aff56f9016b3c206d7116c98a..49ae5fca07bb7bd6614b0580017281f491669dab 100644
--- a/Godeps/_workspace/src/github.com/tendermint/tendermint/types/part_set_test.go
+++ b/Godeps/_workspace/src/github.com/tendermint/tendermint/types/part_set_test.go
@@ -5,7 +5,7 @@ import (
 	"io/ioutil"
 	"testing"
 
-	. "github.com/tendermint/tendermint/common"
+	. "github.com/eris-ltd/eris-db/Godeps/_workspace/src/github.com/tendermint/tendermint/common"
 )
 
 func TestBasicPartSet(t *testing.T) {
diff --git a/Godeps/_workspace/src/github.com/tendermint/tendermint/types/priv_validator.go b/Godeps/_workspace/src/github.com/tendermint/tendermint/types/priv_validator.go
index b70afe94a758f2d5000b354d3a7755ab6b8e5b76..aad8d118c9561fd4931e89b77f71fbef5036154b 100644
--- a/Godeps/_workspace/src/github.com/tendermint/tendermint/types/priv_validator.go
+++ b/Godeps/_workspace/src/github.com/tendermint/tendermint/types/priv_validator.go
@@ -8,11 +8,11 @@ import (
 	"math"
 	"sync"
 
-	acm "github.com/tendermint/tendermint/account"
-	. "github.com/tendermint/tendermint/common"
-	"github.com/tendermint/tendermint/wire"
+	acm "github.com/eris-ltd/eris-db/Godeps/_workspace/src/github.com/tendermint/tendermint/account"
+	. "github.com/eris-ltd/eris-db/Godeps/_workspace/src/github.com/tendermint/tendermint/common"
+	"github.com/eris-ltd/eris-db/Godeps/_workspace/src/github.com/tendermint/tendermint/wire"
 
-	"github.com/tendermint/ed25519"
+	"github.com/eris-ltd/eris-db/Godeps/_workspace/src/github.com/tendermint/ed25519"
 )
 
 const (
diff --git a/Godeps/_workspace/src/github.com/tendermint/tendermint/types/proposal.go b/Godeps/_workspace/src/github.com/tendermint/tendermint/types/proposal.go
index 78c393f928427dcf0f910e92b9d218cc67a158c6..bebfc3a87b65097f316b22a35228365cdf0acfd8 100644
--- a/Godeps/_workspace/src/github.com/tendermint/tendermint/types/proposal.go
+++ b/Godeps/_workspace/src/github.com/tendermint/tendermint/types/proposal.go
@@ -5,9 +5,9 @@ import (
 	"fmt"
 	"io"
 
-	acm "github.com/tendermint/tendermint/account"
-	. "github.com/tendermint/tendermint/common"
-	"github.com/tendermint/tendermint/wire"
+	acm "github.com/eris-ltd/eris-db/Godeps/_workspace/src/github.com/tendermint/tendermint/account"
+	. "github.com/eris-ltd/eris-db/Godeps/_workspace/src/github.com/tendermint/tendermint/common"
+	"github.com/eris-ltd/eris-db/Godeps/_workspace/src/github.com/tendermint/tendermint/wire"
 )
 
 var (
diff --git a/Godeps/_workspace/src/github.com/tendermint/tendermint/types/proposal_test.go b/Godeps/_workspace/src/github.com/tendermint/tendermint/types/proposal_test.go
index f37c11eef9048c54d6ea6d0b9f26aaf78d81feca..fb1e23c9ad00ee45cbbb4dfae92bac0ef9573cda 100644
--- a/Godeps/_workspace/src/github.com/tendermint/tendermint/types/proposal_test.go
+++ b/Godeps/_workspace/src/github.com/tendermint/tendermint/types/proposal_test.go
@@ -3,9 +3,9 @@ package types
 import (
 	"testing"
 
-	acm "github.com/tendermint/tendermint/account"
-	. "github.com/tendermint/tendermint/common"
-	_ "github.com/tendermint/tendermint/config/tendermint_test"
+	acm "github.com/eris-ltd/eris-db/Godeps/_workspace/src/github.com/tendermint/tendermint/account"
+	. "github.com/eris-ltd/eris-db/Godeps/_workspace/src/github.com/tendermint/tendermint/common"
+	_ "github.com/eris-ltd/eris-db/Godeps/_workspace/src/github.com/tendermint/tendermint/config/tendermint_test"
 )
 
 func TestProposalSignable(t *testing.T) {
diff --git a/Godeps/_workspace/src/github.com/tendermint/tendermint/types/tx.go b/Godeps/_workspace/src/github.com/tendermint/tendermint/types/tx.go
index 187c27b4023468ade9e914287b41a4a9709ba904..ff2534e518f3e371fda0c96c0b23b53acfebbf0d 100644
--- a/Godeps/_workspace/src/github.com/tendermint/tendermint/types/tx.go
+++ b/Godeps/_workspace/src/github.com/tendermint/tendermint/types/tx.go
@@ -7,10 +7,10 @@ import (
 
 	"github.com/eris-ltd/eris-db/Godeps/_workspace/src/golang.org/x/crypto/ripemd160"
 
-	acm "github.com/tendermint/tendermint/account"
-	. "github.com/tendermint/tendermint/common"
-	ptypes "github.com/tendermint/tendermint/permission/types"
-	"github.com/tendermint/tendermint/wire"
+	acm "github.com/eris-ltd/eris-db/Godeps/_workspace/src/github.com/tendermint/tendermint/account"
+	. "github.com/eris-ltd/eris-db/Godeps/_workspace/src/github.com/tendermint/tendermint/common"
+	ptypes "github.com/eris-ltd/eris-db/Godeps/_workspace/src/github.com/tendermint/tendermint/permission/types"
+	"github.com/eris-ltd/eris-db/Godeps/_workspace/src/github.com/tendermint/tendermint/wire"
 )
 
 var (
diff --git a/Godeps/_workspace/src/github.com/tendermint/tendermint/types/tx_test.go b/Godeps/_workspace/src/github.com/tendermint/tendermint/types/tx_test.go
index 61acab1567341d02b37cbf306e2a0d38e284ac0d..ad6fb584919ce406376f8d834da45d8722b501e6 100644
--- a/Godeps/_workspace/src/github.com/tendermint/tendermint/types/tx_test.go
+++ b/Godeps/_workspace/src/github.com/tendermint/tendermint/types/tx_test.go
@@ -3,10 +3,10 @@ package types
 import (
 	"testing"
 
-	acm "github.com/tendermint/tendermint/account"
-	. "github.com/tendermint/tendermint/common"
-	_ "github.com/tendermint/tendermint/config/tendermint_test"
-	ptypes "github.com/tendermint/tendermint/permission/types"
+	acm "github.com/eris-ltd/eris-db/Godeps/_workspace/src/github.com/tendermint/tendermint/account"
+	. "github.com/eris-ltd/eris-db/Godeps/_workspace/src/github.com/tendermint/tendermint/common"
+	_ "github.com/eris-ltd/eris-db/Godeps/_workspace/src/github.com/tendermint/tendermint/config/tendermint_test"
+	ptypes "github.com/eris-ltd/eris-db/Godeps/_workspace/src/github.com/tendermint/tendermint/permission/types"
 )
 
 var chainID string
diff --git a/Godeps/_workspace/src/github.com/tendermint/tendermint/types/tx_utils.go b/Godeps/_workspace/src/github.com/tendermint/tendermint/types/tx_utils.go
index 3750483da3edb4513286a0fe6602e2ee114fb0ba..225c445e6792f2e828eb43cba61054b4c69499c9 100644
--- a/Godeps/_workspace/src/github.com/tendermint/tendermint/types/tx_utils.go
+++ b/Godeps/_workspace/src/github.com/tendermint/tendermint/types/tx_utils.go
@@ -2,8 +2,8 @@ package types
 
 import (
 	"fmt"
-	acm "github.com/tendermint/tendermint/account"
-	ptypes "github.com/tendermint/tendermint/permission/types"
+	acm "github.com/eris-ltd/eris-db/Godeps/_workspace/src/github.com/tendermint/tendermint/account"
+	ptypes "github.com/eris-ltd/eris-db/Godeps/_workspace/src/github.com/tendermint/tendermint/permission/types"
 )
 
 type AccountGetter interface {
diff --git a/Godeps/_workspace/src/github.com/tendermint/tendermint/types/validator.go b/Godeps/_workspace/src/github.com/tendermint/tendermint/types/validator.go
index dbf4cbde6cea84dd684131fe2ace711289138176..f6e347829f4716d8a317bee63a7d2fe9f38bef32 100644
--- a/Godeps/_workspace/src/github.com/tendermint/tendermint/types/validator.go
+++ b/Godeps/_workspace/src/github.com/tendermint/tendermint/types/validator.go
@@ -5,9 +5,9 @@ import (
 	"fmt"
 	"io"
 
-	acm "github.com/tendermint/tendermint/account"
-	. "github.com/tendermint/tendermint/common"
-	"github.com/tendermint/tendermint/wire"
+	acm "github.com/eris-ltd/eris-db/Godeps/_workspace/src/github.com/tendermint/tendermint/account"
+	. "github.com/eris-ltd/eris-db/Godeps/_workspace/src/github.com/tendermint/tendermint/common"
+	"github.com/eris-ltd/eris-db/Godeps/_workspace/src/github.com/tendermint/tendermint/wire"
 )
 
 // Persistent (mostly) static data for each Validator
diff --git a/Godeps/_workspace/src/github.com/tendermint/tendermint/types/validator_set.go b/Godeps/_workspace/src/github.com/tendermint/tendermint/types/validator_set.go
index 7dc4ee6256571c31a104d821b52837af62effb77..566dce4972edf531951f450c271cd934f350eca6 100644
--- a/Godeps/_workspace/src/github.com/tendermint/tendermint/types/validator_set.go
+++ b/Godeps/_workspace/src/github.com/tendermint/tendermint/types/validator_set.go
@@ -6,9 +6,9 @@ import (
 	"sort"
 	"strings"
 
-	"github.com/tendermint/tendermint/account"
-	. "github.com/tendermint/tendermint/common"
-	"github.com/tendermint/tendermint/merkle"
+	"github.com/eris-ltd/eris-db/Godeps/_workspace/src/github.com/tendermint/tendermint/account"
+	. "github.com/eris-ltd/eris-db/Godeps/_workspace/src/github.com/tendermint/tendermint/common"
+	"github.com/eris-ltd/eris-db/Godeps/_workspace/src/github.com/tendermint/tendermint/merkle"
 )
 
 // ValidatorSet represent a set of *Validator at a given height.
diff --git a/Godeps/_workspace/src/github.com/tendermint/tendermint/types/validator_set_test.go b/Godeps/_workspace/src/github.com/tendermint/tendermint/types/validator_set_test.go
index c8b5d3075bbe6591cc3aeac4ae77a4be85d7f40e..3d5d01b1d0930b87fa513d26647fac3c28a03a5c 100644
--- a/Godeps/_workspace/src/github.com/tendermint/tendermint/types/validator_set_test.go
+++ b/Godeps/_workspace/src/github.com/tendermint/tendermint/types/validator_set_test.go
@@ -1,8 +1,8 @@
 package types
 
 import (
-	"github.com/tendermint/tendermint/account"
-	. "github.com/tendermint/tendermint/common"
+	"github.com/eris-ltd/eris-db/Godeps/_workspace/src/github.com/tendermint/tendermint/account"
+	. "github.com/eris-ltd/eris-db/Godeps/_workspace/src/github.com/tendermint/tendermint/common"
 
 	"bytes"
 	"strings"
diff --git a/Godeps/_workspace/src/github.com/tendermint/tendermint/types/vote.go b/Godeps/_workspace/src/github.com/tendermint/tendermint/types/vote.go
index c23ca9cb807ca5ae41578ab0de163e0ee84d38ad..be6fbbef97c53434f4140dd15bd1194b20f12520 100644
--- a/Godeps/_workspace/src/github.com/tendermint/tendermint/types/vote.go
+++ b/Godeps/_workspace/src/github.com/tendermint/tendermint/types/vote.go
@@ -5,9 +5,9 @@ import (
 	"fmt"
 	"io"
 
-	acm "github.com/tendermint/tendermint/account"
-	. "github.com/tendermint/tendermint/common"
-	"github.com/tendermint/tendermint/wire"
+	acm "github.com/eris-ltd/eris-db/Godeps/_workspace/src/github.com/tendermint/tendermint/account"
+	. "github.com/eris-ltd/eris-db/Godeps/_workspace/src/github.com/tendermint/tendermint/common"
+	"github.com/eris-ltd/eris-db/Godeps/_workspace/src/github.com/tendermint/tendermint/wire"
 )
 
 var (
diff --git a/Godeps/_workspace/src/github.com/tendermint/tendermint/types/vote_set.go b/Godeps/_workspace/src/github.com/tendermint/tendermint/types/vote_set.go
index 621e3076399dcf3afd0af9d1c7d9a2f5a6187d7a..a1c551e9202f7b7fcf16fdaadd8b42ab143c7f5e 100644
--- a/Godeps/_workspace/src/github.com/tendermint/tendermint/types/vote_set.go
+++ b/Godeps/_workspace/src/github.com/tendermint/tendermint/types/vote_set.go
@@ -6,9 +6,9 @@ import (
 	"strings"
 	"sync"
 
-	acm "github.com/tendermint/tendermint/account"
-	. "github.com/tendermint/tendermint/common"
-	"github.com/tendermint/tendermint/wire"
+	acm "github.com/eris-ltd/eris-db/Godeps/_workspace/src/github.com/tendermint/tendermint/account"
+	. "github.com/eris-ltd/eris-db/Godeps/_workspace/src/github.com/tendermint/tendermint/common"
+	"github.com/eris-ltd/eris-db/Godeps/_workspace/src/github.com/tendermint/tendermint/wire"
 )
 
 // VoteSet helps collect signatures from validators at each height+round
diff --git a/Godeps/_workspace/src/github.com/tendermint/tendermint/types/vote_set_test.go b/Godeps/_workspace/src/github.com/tendermint/tendermint/types/vote_set_test.go
index d521478e07a61b677e8e766c35ba6bfd8a0cdf11..10a42f31e67c964fa91075945f7550e9b25fd59c 100644
--- a/Godeps/_workspace/src/github.com/tendermint/tendermint/types/vote_set_test.go
+++ b/Godeps/_workspace/src/github.com/tendermint/tendermint/types/vote_set_test.go
@@ -4,9 +4,9 @@ import (
 	"bytes"
 	"sort"
 
-	. "github.com/tendermint/tendermint/common"
-	. "github.com/tendermint/tendermint/common/test"
-	_ "github.com/tendermint/tendermint/config/tendermint_test"
+	. "github.com/eris-ltd/eris-db/Godeps/_workspace/src/github.com/tendermint/tendermint/common"
+	. "github.com/eris-ltd/eris-db/Godeps/_workspace/src/github.com/tendermint/tendermint/common/test"
+	_ "github.com/eris-ltd/eris-db/Godeps/_workspace/src/github.com/tendermint/tendermint/config/tendermint_test"
 
 	"testing"
 )
diff --git a/Godeps/_workspace/src/github.com/tendermint/tendermint/vm/log.go b/Godeps/_workspace/src/github.com/tendermint/tendermint/vm/log.go
index 9862495b06c299cc1f6b9a5ddb4d20f65fbd4499..cc097564ff5b6e0b44b2309dc57c963de187ba4c 100644
--- a/Godeps/_workspace/src/github.com/tendermint/tendermint/vm/log.go
+++ b/Godeps/_workspace/src/github.com/tendermint/tendermint/vm/log.go
@@ -1,7 +1,7 @@
 package vm
 
 import (
-	"github.com/tendermint/tendermint/logger"
+	"github.com/eris-ltd/eris-db/Godeps/_workspace/src/github.com/tendermint/tendermint/logger"
 )
 
 var log = logger.New("module", "vm")
diff --git a/Godeps/_workspace/src/github.com/tendermint/tendermint/vm/native.go b/Godeps/_workspace/src/github.com/tendermint/tendermint/vm/native.go
index 0f601aa577ed3a9819eff257f5c1fda2b84c33cc..e5fd2def190db4a1ce83356c6b8ec587c8ffea0a 100644
--- a/Godeps/_workspace/src/github.com/tendermint/tendermint/vm/native.go
+++ b/Godeps/_workspace/src/github.com/tendermint/tendermint/vm/native.go
@@ -3,7 +3,7 @@ package vm
 import (
 	"crypto/sha256"
 	"github.com/eris-ltd/eris-db/Godeps/_workspace/src/code.google.com/p/go.crypto/ripemd160"
-	. "github.com/tendermint/tendermint/common"
+	. "github.com/eris-ltd/eris-db/Godeps/_workspace/src/github.com/tendermint/tendermint/common"
 )
 
 var registeredNativeContracts = make(map[Word256]NativeContract)
diff --git a/Godeps/_workspace/src/github.com/tendermint/tendermint/vm/randentropy/rand_entropy.go b/Godeps/_workspace/src/github.com/tendermint/tendermint/vm/randentropy/rand_entropy.go
index 615fee35da59cc1d1cdaa678bdad7352277ce6f2..c16221c5c2934c96c7a7827ecdbced1af1e16ff0 100644
--- a/Godeps/_workspace/src/github.com/tendermint/tendermint/vm/randentropy/rand_entropy.go
+++ b/Godeps/_workspace/src/github.com/tendermint/tendermint/vm/randentropy/rand_entropy.go
@@ -2,7 +2,7 @@ package randentropy
 
 import (
 	crand "crypto/rand"
-	"github.com/tendermint/tendermint/vm/sha3"
+	"github.com/eris-ltd/eris-db/Godeps/_workspace/src/github.com/tendermint/tendermint/vm/sha3"
 	"io"
 )
 
diff --git a/Godeps/_workspace/src/github.com/tendermint/tendermint/vm/snative.go b/Godeps/_workspace/src/github.com/tendermint/tendermint/vm/snative.go
index 2fd3b0f945f687e66542bef066d2fff5dcbf998a..a9a5c9ee4dee933b043464852a53972c79eb25ff 100644
--- a/Godeps/_workspace/src/github.com/tendermint/tendermint/vm/snative.go
+++ b/Godeps/_workspace/src/github.com/tendermint/tendermint/vm/snative.go
@@ -3,8 +3,8 @@ package vm
 import (
 	"fmt"
 
-	. "github.com/tendermint/tendermint/common"
-	ptypes "github.com/tendermint/tendermint/permission/types"
+	. "github.com/eris-ltd/eris-db/Godeps/_workspace/src/github.com/tendermint/tendermint/common"
+	ptypes "github.com/eris-ltd/eris-db/Godeps/_workspace/src/github.com/tendermint/tendermint/permission/types"
 )
 
 // TODO: ABI
diff --git a/Godeps/_workspace/src/github.com/tendermint/tendermint/vm/stack.go b/Godeps/_workspace/src/github.com/tendermint/tendermint/vm/stack.go
index 7dae3e71d7567f4170d0e9eef74e9d3e4ba65869..764d658fd53d77638e407e93f7473ba1f3d2a015 100644
--- a/Godeps/_workspace/src/github.com/tendermint/tendermint/vm/stack.go
+++ b/Godeps/_workspace/src/github.com/tendermint/tendermint/vm/stack.go
@@ -2,7 +2,7 @@ package vm
 
 import (
 	"fmt"
-	. "github.com/tendermint/tendermint/common"
+	. "github.com/eris-ltd/eris-db/Godeps/_workspace/src/github.com/tendermint/tendermint/common"
 )
 
 // Not goroutine safe
diff --git a/Godeps/_workspace/src/github.com/tendermint/tendermint/vm/test/fake_app_state.go b/Godeps/_workspace/src/github.com/tendermint/tendermint/vm/test/fake_app_state.go
index 72dcca58e2d0e39e9a7a857c9521341f9b0b8a22..1a328b992201a5bb976801279f3e4a3f6747924f 100644
--- a/Godeps/_workspace/src/github.com/tendermint/tendermint/vm/test/fake_app_state.go
+++ b/Godeps/_workspace/src/github.com/tendermint/tendermint/vm/test/fake_app_state.go
@@ -1,9 +1,9 @@
 package vm
 
 import (
-	. "github.com/tendermint/tendermint/common"
-	. "github.com/tendermint/tendermint/vm"
-	"github.com/tendermint/tendermint/vm/sha3"
+	. "github.com/eris-ltd/eris-db/Godeps/_workspace/src/github.com/tendermint/tendermint/common"
+	. "github.com/eris-ltd/eris-db/Godeps/_workspace/src/github.com/tendermint/tendermint/vm"
+	"github.com/eris-ltd/eris-db/Godeps/_workspace/src/github.com/tendermint/tendermint/vm/sha3"
 )
 
 type FakeAppState struct {
diff --git a/Godeps/_workspace/src/github.com/tendermint/tendermint/vm/test/log_event_test.go b/Godeps/_workspace/src/github.com/tendermint/tendermint/vm/test/log_event_test.go
index fa598b00e9101369398745a7de151371c1976bfc..c0fca12dd1ab36e51dfc34d47e340a570e81119f 100644
--- a/Godeps/_workspace/src/github.com/tendermint/tendermint/vm/test/log_event_test.go
+++ b/Godeps/_workspace/src/github.com/tendermint/tendermint/vm/test/log_event_test.go
@@ -5,10 +5,10 @@ import (
 	"reflect"
 	"testing"
 
-	. "github.com/tendermint/tendermint/common"
-	"github.com/tendermint/tendermint/events"
-	"github.com/tendermint/tendermint/types"
-	. "github.com/tendermint/tendermint/vm"
+	. "github.com/eris-ltd/eris-db/Godeps/_workspace/src/github.com/tendermint/tendermint/common"
+	"github.com/eris-ltd/eris-db/Godeps/_workspace/src/github.com/tendermint/tendermint/events"
+	"github.com/eris-ltd/eris-db/Godeps/_workspace/src/github.com/tendermint/tendermint/types"
+	. "github.com/eris-ltd/eris-db/Godeps/_workspace/src/github.com/tendermint/tendermint/vm"
 )
 
 var expectedData = []byte{0x10}
diff --git a/Godeps/_workspace/src/github.com/tendermint/tendermint/vm/test/vm_test.go b/Godeps/_workspace/src/github.com/tendermint/tendermint/vm/test/vm_test.go
index dc268a6a317f57cf55ffd168afaf9e827c86cc1a..899bb2b7b8b27e57903d42b2a9a03af20ae3a891 100644
--- a/Godeps/_workspace/src/github.com/tendermint/tendermint/vm/test/vm_test.go
+++ b/Godeps/_workspace/src/github.com/tendermint/tendermint/vm/test/vm_test.go
@@ -8,11 +8,11 @@ import (
 	"testing"
 	"time"
 
-	. "github.com/tendermint/tendermint/common"
-	"github.com/tendermint/tendermint/events"
-	ptypes "github.com/tendermint/tendermint/permission/types"
-	"github.com/tendermint/tendermint/types"
-	. "github.com/tendermint/tendermint/vm"
+	. "github.com/eris-ltd/eris-db/Godeps/_workspace/src/github.com/tendermint/tendermint/common"
+	"github.com/eris-ltd/eris-db/Godeps/_workspace/src/github.com/tendermint/tendermint/events"
+	ptypes "github.com/eris-ltd/eris-db/Godeps/_workspace/src/github.com/tendermint/tendermint/permission/types"
+	"github.com/eris-ltd/eris-db/Godeps/_workspace/src/github.com/tendermint/tendermint/types"
+	. "github.com/eris-ltd/eris-db/Godeps/_workspace/src/github.com/tendermint/tendermint/vm"
 )
 
 func newAppState() *FakeAppState {
diff --git a/Godeps/_workspace/src/github.com/tendermint/tendermint/vm/types.go b/Godeps/_workspace/src/github.com/tendermint/tendermint/vm/types.go
index cb9bc64ff241ab4b654500886b19efdf99e7150e..26103be6af659c3066f6c5eafe9db342587c4008 100644
--- a/Godeps/_workspace/src/github.com/tendermint/tendermint/vm/types.go
+++ b/Godeps/_workspace/src/github.com/tendermint/tendermint/vm/types.go
@@ -1,8 +1,8 @@
 package vm
 
 import (
-	. "github.com/tendermint/tendermint/common"
-	ptypes "github.com/tendermint/tendermint/permission/types"
+	. "github.com/eris-ltd/eris-db/Godeps/_workspace/src/github.com/tendermint/tendermint/common"
+	ptypes "github.com/eris-ltd/eris-db/Godeps/_workspace/src/github.com/tendermint/tendermint/permission/types"
 )
 
 const (
diff --git a/Godeps/_workspace/src/github.com/tendermint/tendermint/vm/vm.go b/Godeps/_workspace/src/github.com/tendermint/tendermint/vm/vm.go
index 7d60752e3a64529fec7df4d00bc2ae1662f40311..38ce23f7919d9bf453d2e40945314ef0a6b5825a 100644
--- a/Godeps/_workspace/src/github.com/tendermint/tendermint/vm/vm.go
+++ b/Godeps/_workspace/src/github.com/tendermint/tendermint/vm/vm.go
@@ -6,11 +6,11 @@ import (
 	"fmt"
 	"math/big"
 
-	. "github.com/tendermint/tendermint/common"
-	"github.com/tendermint/tendermint/events"
-	ptypes "github.com/tendermint/tendermint/permission/types"
-	"github.com/tendermint/tendermint/types"
-	"github.com/tendermint/tendermint/vm/sha3"
+	. "github.com/eris-ltd/eris-db/Godeps/_workspace/src/github.com/tendermint/tendermint/common"
+	"github.com/eris-ltd/eris-db/Godeps/_workspace/src/github.com/tendermint/tendermint/events"
+	ptypes "github.com/eris-ltd/eris-db/Godeps/_workspace/src/github.com/tendermint/tendermint/permission/types"
+	"github.com/eris-ltd/eris-db/Godeps/_workspace/src/github.com/tendermint/tendermint/types"
+	"github.com/eris-ltd/eris-db/Godeps/_workspace/src/github.com/tendermint/tendermint/vm/sha3"
 )
 
 var (
diff --git a/Godeps/_workspace/src/github.com/tendermint/tendermint/wire/byteslice.go b/Godeps/_workspace/src/github.com/tendermint/tendermint/wire/byteslice.go
index ee4bb941cf6bd10c6d4be930e57aafe8e02054a3..8aaedd8d10f21fb520db2eaa90a973e2e41c7f54 100644
--- a/Godeps/_workspace/src/github.com/tendermint/tendermint/wire/byteslice.go
+++ b/Godeps/_workspace/src/github.com/tendermint/tendermint/wire/byteslice.go
@@ -3,7 +3,7 @@ package wire
 import (
 	"io"
 
-	. "github.com/tendermint/tendermint/common"
+	. "github.com/eris-ltd/eris-db/Godeps/_workspace/src/github.com/tendermint/tendermint/common"
 )
 
 func WriteByteSlice(bz []byte, w io.Writer, n *int64, err *error) {
diff --git a/Godeps/_workspace/src/github.com/tendermint/tendermint/wire/codec.go b/Godeps/_workspace/src/github.com/tendermint/tendermint/wire/codec.go
index 63edb94aa5b716410447511ddae9bf94c24cc1da..c032d76a7c6be57195c7f260c07bc15bbdf91e88 100644
--- a/Godeps/_workspace/src/github.com/tendermint/tendermint/wire/codec.go
+++ b/Godeps/_workspace/src/github.com/tendermint/tendermint/wire/codec.go
@@ -4,7 +4,7 @@ import (
 	"bytes"
 	"errors"
 	"fmt"
-	. "github.com/tendermint/tendermint/common"
+	. "github.com/eris-ltd/eris-db/Godeps/_workspace/src/github.com/tendermint/tendermint/common"
 	"io"
 	"reflect"
 	"time"
diff --git a/Godeps/_workspace/src/github.com/tendermint/tendermint/wire/log.go b/Godeps/_workspace/src/github.com/tendermint/tendermint/wire/log.go
index 610b05f69c3cd51b50e16d29eb0855eaa7bd2dad..3591db3d59596f3056cd2450bfcd58f1d7abb615 100644
--- a/Godeps/_workspace/src/github.com/tendermint/tendermint/wire/log.go
+++ b/Godeps/_workspace/src/github.com/tendermint/tendermint/wire/log.go
@@ -1,8 +1,8 @@
 package wire
 
 import (
-	"github.com/tendermint/log15"
-	"github.com/tendermint/tendermint/logger"
+	"github.com/eris-ltd/eris-db/Godeps/_workspace/src/github.com/tendermint/log15"
+	"github.com/eris-ltd/eris-db/Godeps/_workspace/src/github.com/tendermint/tendermint/logger"
 )
 
 var log = logger.New("module", "binary")
diff --git a/Godeps/_workspace/src/github.com/tendermint/tendermint/wire/reflect.go b/Godeps/_workspace/src/github.com/tendermint/tendermint/wire/reflect.go
index d964d585a7b9ab62590c63e1b24230e66c4d091b..8284594de0a606afa70857495731347bc32657a2 100644
--- a/Godeps/_workspace/src/github.com/tendermint/tendermint/wire/reflect.go
+++ b/Godeps/_workspace/src/github.com/tendermint/tendermint/wire/reflect.go
@@ -9,7 +9,7 @@ import (
 	"sync"
 	"time"
 
-	. "github.com/tendermint/tendermint/common"
+	. "github.com/eris-ltd/eris-db/Godeps/_workspace/src/github.com/tendermint/tendermint/common"
 )
 
 const (
diff --git a/Godeps/_workspace/src/github.com/tendermint/tendermint/wire/reflect_test.go b/Godeps/_workspace/src/github.com/tendermint/tendermint/wire/reflect_test.go
index b21b8bf2a29645e4c7e886a7aa91782f233e899f..2af5d8a5e5f1fe36c7d7e4f8f8594fda5f747221 100644
--- a/Godeps/_workspace/src/github.com/tendermint/tendermint/wire/reflect_test.go
+++ b/Godeps/_workspace/src/github.com/tendermint/tendermint/wire/reflect_test.go
@@ -7,7 +7,7 @@ import (
 	"testing"
 	"time"
 
-	. "github.com/tendermint/tendermint/common"
+	. "github.com/eris-ltd/eris-db/Godeps/_workspace/src/github.com/tendermint/tendermint/common"
 )
 
 type SimpleStruct struct {
diff --git a/Godeps/_workspace/src/github.com/tendermint/tendermint/wire/string.go b/Godeps/_workspace/src/github.com/tendermint/tendermint/wire/string.go
index 00ee3e9998fe4b9cea2541694eb2cb4ca81ad40f..c0c586f309c73a00adb0cbb40c3225229c949b59 100644
--- a/Godeps/_workspace/src/github.com/tendermint/tendermint/wire/string.go
+++ b/Godeps/_workspace/src/github.com/tendermint/tendermint/wire/string.go
@@ -3,7 +3,7 @@ package wire
 import (
 	"io"
 
-	. "github.com/tendermint/tendermint/common"
+	. "github.com/eris-ltd/eris-db/Godeps/_workspace/src/github.com/tendermint/tendermint/common"
 )
 
 // String
diff --git a/Godeps/_workspace/src/github.com/tendermint/tendermint/wire/time.go b/Godeps/_workspace/src/github.com/tendermint/tendermint/wire/time.go
index fde8b8ae5c1c632500f14f0400e38a46907a4538..b59ea396920148854744a6bad4ee2f95909994be 100644
--- a/Godeps/_workspace/src/github.com/tendermint/tendermint/wire/time.go
+++ b/Godeps/_workspace/src/github.com/tendermint/tendermint/wire/time.go
@@ -4,7 +4,7 @@ import (
 	"io"
 	"time"
 
-	. "github.com/tendermint/tendermint/common"
+	. "github.com/eris-ltd/eris-db/Godeps/_workspace/src/github.com/tendermint/tendermint/common"
 )
 
 /*
diff --git a/Godeps/_workspace/src/github.com/tendermint/tendermint/wire/util.go b/Godeps/_workspace/src/github.com/tendermint/tendermint/wire/util.go
index 05d7125ed8a88610ceac3a7ec5390ea84213b463..91aa6f5c31526aec683c6346381c766ebfe7b836 100644
--- a/Godeps/_workspace/src/github.com/tendermint/tendermint/wire/util.go
+++ b/Godeps/_workspace/src/github.com/tendermint/tendermint/wire/util.go
@@ -5,7 +5,7 @@ import (
 	"crypto/sha256"
 	"github.com/eris-ltd/eris-db/Godeps/_workspace/src/code.google.com/p/go.crypto/ripemd160"
 
-	. "github.com/tendermint/tendermint/common"
+	. "github.com/eris-ltd/eris-db/Godeps/_workspace/src/github.com/tendermint/tendermint/common"
 )
 
 func BinaryBytes(o interface{}) []byte {
diff --git a/Godeps/_workspace/src/github.com/tendermint/tendermint/wire/wire.go b/Godeps/_workspace/src/github.com/tendermint/tendermint/wire/wire.go
index aece054fded3a51c92dd41a4b09b770e4b7aecdb..9054fdb6c6c9f89973f3b1b5a450c6609452fa1c 100644
--- a/Godeps/_workspace/src/github.com/tendermint/tendermint/wire/wire.go
+++ b/Godeps/_workspace/src/github.com/tendermint/tendermint/wire/wire.go
@@ -6,7 +6,7 @@ import (
 	"io"
 	"reflect"
 
-	. "github.com/tendermint/tendermint/common"
+	. "github.com/eris-ltd/eris-db/Godeps/_workspace/src/github.com/tendermint/tendermint/common"
 )
 
 // TODO document and maybe make it configurable.
diff --git a/Godeps/_workspace/src/github.com/tommy351/gin-cors/cors.go b/Godeps/_workspace/src/github.com/tommy351/gin-cors/cors.go
index a294580420d504bad735dd1fb206f54820ed5d93..8c9735f1bf07cdbf0b3aa735dcd689f3324d35a0 100644
--- a/Godeps/_workspace/src/github.com/tommy351/gin-cors/cors.go
+++ b/Godeps/_workspace/src/github.com/tommy351/gin-cors/cors.go
@@ -6,7 +6,7 @@ import (
 	"strings"
 	"time"
 
-	"github.com/gin-gonic/gin"
+	"github.com/eris-ltd/eris-db/Godeps/_workspace/src/github.com/gin-gonic/gin"
 )
 
 var (
diff --git a/Godeps/_workspace/src/github.com/tommy351/gin-cors/cors_test.go b/Godeps/_workspace/src/github.com/tommy351/gin-cors/cors_test.go
index bd12c2006e9289c86808d48dd67c4615be93a70d..3fca7178f7dcec3f0e18951623daa5dfb2f6406c 100644
--- a/Godeps/_workspace/src/github.com/tommy351/gin-cors/cors_test.go
+++ b/Godeps/_workspace/src/github.com/tommy351/gin-cors/cors_test.go
@@ -7,8 +7,8 @@ import (
 	"testing"
 	"time"
 
-	"github.com/gin-gonic/gin"
-	"github.com/stretchr/testify/assert"
+	"github.com/eris-ltd/eris-db/Godeps/_workspace/src/github.com/gin-gonic/gin"
+	"github.com/eris-ltd/eris-db/Godeps/_workspace/src/github.com/stretchr/testify/assert"
 )
 
 func init() {
diff --git a/client/ws_client.go b/client/ws_client.go
index 2f562927f6a99bb19852570f46b185f0e3da6c7b..d07d9598bb355d928a8f9f6d2e7b4f553786e2cd 100644
--- a/client/ws_client.go
+++ b/client/ws_client.go
@@ -3,7 +3,7 @@ package client
 
 import (
 	"fmt"
-	"github.com/gorilla/websocket"
+	"github.com/eris-ltd/eris-db/Godeps/_workspace/src/github.com/gorilla/websocket"
 	"net/http"
 )
 
diff --git a/cmd/erisdbss/main.go b/cmd/erisdbss/main.go
index 69e5542e17a0bb17b733b16a336dec9573aa81fa..ce3283363748e31e8a612bd8b8d4a4f360aac461 100644
--- a/cmd/erisdbss/main.go
+++ b/cmd/erisdbss/main.go
@@ -1,7 +1,7 @@
 package main
 
 import (
-	"github.com/gin-gonic/gin"
+	"github.com/eris-ltd/eris-db/Godeps/_workspace/src/github.com/gin-gonic/gin"
 	ess "github.com/eris-ltd/eris-db/erisdb/erisdbss"
 	"github.com/eris-ltd/eris-db/server"
 	"os"
diff --git a/erisdb/codec.go b/erisdb/codec.go
index 0c13f742a9cfa04c2a3f80351ef5f367efb88532..04055df146a93af48b05a10abe4e1e71f5814979 100644
--- a/erisdb/codec.go
+++ b/erisdb/codec.go
@@ -1,7 +1,7 @@
 package erisdb
 
 import (
-	"github.com/tendermint/tendermint/wire"
+	"github.com/eris-ltd/eris-db/Godeps/_workspace/src/github.com/tendermint/tendermint/wire"
 	rpc "github.com/eris-ltd/eris-db/rpc"
 	"io"
 	"io/ioutil"
diff --git a/erisdb/erisdbss/http.go b/erisdb/erisdbss/http.go
index 300ca3678761356e7590470d31eca3db17999e11..bb52a0e34af5cfbaa484a04bfe7d92e25a10eead 100644
--- a/erisdb/erisdbss/http.go
+++ b/erisdb/erisdbss/http.go
@@ -3,11 +3,11 @@ package erisdbss
 import (
 	"bytes"
 	"encoding/json"
-	"github.com/gin-gonic/gin"
-	. "github.com/tendermint/tendermint/common"
-	stypes "github.com/tendermint/tendermint/state/types"
-	"github.com/tendermint/tendermint/types"
-	"github.com/tendermint/tendermint/wire"
+	"github.com/eris-ltd/eris-db/Godeps/_workspace/src/github.com/gin-gonic/gin"
+	. "github.com/eris-ltd/eris-db/Godeps/_workspace/src/github.com/tendermint/tendermint/common"
+	stypes "github.com/eris-ltd/eris-db/Godeps/_workspace/src/github.com/tendermint/tendermint/state/types"
+	"github.com/eris-ltd/eris-db/Godeps/_workspace/src/github.com/tendermint/tendermint/types"
+	"github.com/eris-ltd/eris-db/Godeps/_workspace/src/github.com/tendermint/tendermint/wire"
 	"github.com/eris-ltd/eris-db/server"
 	"net/http"
 	"os"
diff --git a/erisdb/erisdbss/log.go b/erisdb/erisdbss/log.go
index 719216427a0cbd239e0ae187dcfac8bf14604a72..37760e9c26334c5751d2e5da0200e196234cda2c 100644
--- a/erisdb/erisdbss/log.go
+++ b/erisdb/erisdbss/log.go
@@ -1,7 +1,7 @@
 package erisdbss
 
 import (
-	"github.com/tendermint/log15"
+	"github.com/eris-ltd/eris-db/Godeps/_workspace/src/github.com/tendermint/log15"
 )
 
 var log = log15.New("module", "eris/serverserver")
diff --git a/erisdb/erisdbss/server_manager.go b/erisdb/erisdbss/server_manager.go
index dc8002ad319278f336d3a6222f655813abeb9bbb..5d25ef4ac9072b370b1a3eec25c15bad836f1faa 100644
--- a/erisdb/erisdbss/server_manager.go
+++ b/erisdb/erisdbss/server_manager.go
@@ -3,8 +3,8 @@ package erisdbss
 import (
 	"bufio"
 	"fmt"
-	. "github.com/tendermint/tendermint/common"
-	"github.com/tendermint/tendermint/wire"
+	. "github.com/eris-ltd/eris-db/Godeps/_workspace/src/github.com/tendermint/tendermint/common"
+	"github.com/eris-ltd/eris-db/Godeps/_workspace/src/github.com/tendermint/tendermint/wire"
 	"github.com/eris-ltd/eris-db/files"
 	"github.com/eris-ltd/eris-db/server"
 	"os"
@@ -63,7 +63,7 @@ func (this *CmdProcess) Start(doneChan chan<- error) {
 		log.Debug(text)
 		if strings.Index(text, this.token) != -1 {
 			log.Debug("Token found", "token", this.token)
-			go func(){
+			go func() {
 				for scanner.Scan() {
 					text := scanner.Text()
 					log.Debug(text)
diff --git a/erisdb/event_cache.go b/erisdb/event_cache.go
index c9c2bd746cdd0b40a4eaa9011a50293fc1a33faf..81d4bca5d4394d8f852d4cefbfcec1b1c594f1fd 100644
--- a/erisdb/event_cache.go
+++ b/erisdb/event_cache.go
@@ -6,7 +6,7 @@ import (
 	"sync"
 	"time"
 
-	"github.com/tendermint/tendermint/types"
+	"github.com/eris-ltd/eris-db/Godeps/_workspace/src/github.com/tendermint/tendermint/types"
 )
 
 var (
diff --git a/erisdb/event_cache_test.go b/erisdb/event_cache_test.go
index 2ca5d280c1b1cdb57330cb67cbaabe6e0c8cd877..83410eae32ca251670dfceb615e8a64d8aed40c9 100644
--- a/erisdb/event_cache_test.go
+++ b/erisdb/event_cache_test.go
@@ -7,8 +7,8 @@ import (
 	"testing"
 	"time"
 
-	"github.com/stretchr/testify/assert"
-	"github.com/tendermint/tendermint/types"
+	"github.com/eris-ltd/eris-db/Godeps/_workspace/src/github.com/stretchr/testify/assert"
+	"github.com/eris-ltd/eris-db/Godeps/_workspace/src/github.com/tendermint/tendermint/types"
 )
 
 var mockInterval = 10 * time.Millisecond
diff --git a/erisdb/event_filters.go b/erisdb/event_filters.go
index 36dd87f0ce335e5edb5905656b0f82a07d57023c..0b8c6033fa58a072d8e50a76d3c3c33e25509b60 100644
--- a/erisdb/event_filters.go
+++ b/erisdb/event_filters.go
@@ -4,7 +4,7 @@ import (
 	"bytes"
 	"encoding/hex"
 	"fmt"
-	"github.com/tendermint/tendermint/types"
+	"github.com/eris-ltd/eris-db/Godeps/_workspace/src/github.com/tendermint/tendermint/types"
 	ep "github.com/eris-ltd/eris-db/erisdb/pipe"
 )
 
diff --git a/erisdb/json_service.go b/erisdb/json_service.go
index 97a7df78c571e45788c20c29ee66225474d5d393..c08eec29eaa8a848daa828c335c5ba922b5324dc 100644
--- a/erisdb/json_service.go
+++ b/erisdb/json_service.go
@@ -2,7 +2,7 @@ package erisdb
 
 import (
 	"encoding/json"
-	"github.com/gin-gonic/gin"
+	"github.com/eris-ltd/eris-db/Godeps/_workspace/src/github.com/gin-gonic/gin"
 	ep "github.com/eris-ltd/eris-db/erisdb/pipe"
 	rpc "github.com/eris-ltd/eris-db/rpc"
 	"github.com/eris-ltd/eris-db/server"
diff --git a/erisdb/methods.go b/erisdb/methods.go
index 4c3ca05279ec0be370180818d0e9e8654f4e1078..0b0a370eee5fdb224a8d6f52a686caef700c5ff4 100644
--- a/erisdb/methods.go
+++ b/erisdb/methods.go
@@ -3,7 +3,7 @@ package erisdb
 import (
 	"crypto/rand"
 	"encoding/hex"
-	"github.com/tendermint/tendermint/types"
+	"github.com/eris-ltd/eris-db/Godeps/_workspace/src/github.com/tendermint/tendermint/types"
 	ep "github.com/eris-ltd/eris-db/erisdb/pipe"
 	rpc "github.com/eris-ltd/eris-db/rpc"
 	"strings"
@@ -42,7 +42,7 @@ const (
 	SIGN_TX                   = SERVICE_NAME + ".signTx"
 	TRANSACT                  = SERVICE_NAME + ".transact"
 	TRANSACT_AND_HOLD         = SERVICE_NAME + ".transactAndHold"
-	SEND                  	  = SERVICE_NAME + ".send"
+	SEND                      = SERVICE_NAME + ".send"
 	SEND_AND_HOLD             = SERVICE_NAME + ".sendAndHold"
 	TRANSACT_NAMEREG          = SERVICE_NAME + ".transactNameReg"
 	EVENT_SUBSCRIBE           = SERVICE_NAME + ".eventSubscribe" // Events
diff --git a/erisdb/middleware_test.go b/erisdb/middleware_test.go
index 7fc366ef92171c2fa9748822b501703bbc8150df..2774abb2a811924b42dc35f73f2a56eef4a0f90e 100644
--- a/erisdb/middleware_test.go
+++ b/erisdb/middleware_test.go
@@ -1,7 +1,7 @@
 package erisdb
 
 import (
-	"github.com/stretchr/testify/assert"
+	"github.com/eris-ltd/eris-db/Godeps/_workspace/src/github.com/stretchr/testify/assert"
 	ep "github.com/eris-ltd/eris-db/erisdb/pipe"
 	"testing"
 )
diff --git a/erisdb/params.go b/erisdb/params.go
index 3684d66e9706c565d393f9653519825b32e7d038..2046756577d4ff3a0527180be8569f168d905b5f 100644
--- a/erisdb/params.go
+++ b/erisdb/params.go
@@ -1,8 +1,8 @@
 package erisdb
 
 import (
-	"github.com/tendermint/tendermint/account"
-	"github.com/tendermint/tendermint/types"
+	"github.com/eris-ltd/eris-db/Godeps/_workspace/src/github.com/tendermint/tendermint/account"
+	"github.com/eris-ltd/eris-db/Godeps/_workspace/src/github.com/tendermint/tendermint/types"
 	"github.com/eris-ltd/eris-db/erisdb/pipe"
 )
 
diff --git a/erisdb/pipe/accounts.go b/erisdb/pipe/accounts.go
index 916baec3df79bce18307705aeba0ccd55a1bd71e..94dfbad9a9a2aa945f929cbf7cfc79e5cecdded4 100644
--- a/erisdb/pipe/accounts.go
+++ b/erisdb/pipe/accounts.go
@@ -4,10 +4,10 @@ import (
 	"bytes"
 	"encoding/hex"
 	"fmt"
-	"github.com/tendermint/tendermint/account"
-	cmn "github.com/tendermint/tendermint/common"
-	cs "github.com/tendermint/tendermint/consensus"
-	mempl "github.com/tendermint/tendermint/mempool"
+	"github.com/eris-ltd/eris-db/Godeps/_workspace/src/github.com/tendermint/tendermint/account"
+	cmn "github.com/eris-ltd/eris-db/Godeps/_workspace/src/github.com/tendermint/tendermint/common"
+	cs "github.com/eris-ltd/eris-db/Godeps/_workspace/src/github.com/tendermint/tendermint/consensus"
+	mempl "github.com/eris-ltd/eris-db/Godeps/_workspace/src/github.com/tendermint/tendermint/mempool"
 	"sync"
 )
 
diff --git a/erisdb/pipe/blockchain.go b/erisdb/pipe/blockchain.go
index 93ecd5b5fa4f98da01dfbe8b7ae9d572d9cf8fcf..cb01eb4bce238fb7315707d5a7532c27262bbc99 100644
--- a/erisdb/pipe/blockchain.go
+++ b/erisdb/pipe/blockchain.go
@@ -2,10 +2,10 @@ package pipe
 
 import (
 	"fmt"
-	bc "github.com/tendermint/tendermint/blockchain"
-	dbm "github.com/tendermint/tendermint/db"
-	"github.com/tendermint/tendermint/state"
-	"github.com/tendermint/tendermint/types"
+	bc "github.com/eris-ltd/eris-db/Godeps/_workspace/src/github.com/tendermint/tendermint/blockchain"
+	dbm "github.com/eris-ltd/eris-db/Godeps/_workspace/src/github.com/tendermint/tendermint/db"
+	"github.com/eris-ltd/eris-db/Godeps/_workspace/src/github.com/tendermint/tendermint/state"
+	"github.com/eris-ltd/eris-db/Godeps/_workspace/src/github.com/tendermint/tendermint/types"
 	"math"
 	"strconv"
 	"strings"
diff --git a/erisdb/pipe/config.go b/erisdb/pipe/config.go
index 3a2f232116c0dc7c828bd8aeed9b4f493fd2448c..a7e51520ff5f6865287a991ba815d026b10e4f78 100644
--- a/erisdb/pipe/config.go
+++ b/erisdb/pipe/config.go
@@ -1,8 +1,8 @@
 package pipe
 
 import (
-	"github.com/tendermint/log15"
-	cfg "github.com/tendermint/tendermint/config"
+	"github.com/eris-ltd/eris-db/Godeps/_workspace/src/github.com/tendermint/log15"
+	cfg "github.com/eris-ltd/eris-db/Godeps/_workspace/src/github.com/tendermint/tendermint/config"
 )
 
 var log = log15.New("module", "eris/erisdb_pipe")
diff --git a/erisdb/pipe/consensus.go b/erisdb/pipe/consensus.go
index d89d47f33256d28e4e35da54e61b515550629093..2d5ecdf2489afb568500610d0237309357f92334 100644
--- a/erisdb/pipe/consensus.go
+++ b/erisdb/pipe/consensus.go
@@ -1,10 +1,10 @@
 package pipe
 
 import (
-	cm "github.com/tendermint/tendermint/consensus"
-	"github.com/tendermint/tendermint/p2p"
-	"github.com/tendermint/tendermint/types"
-	"github.com/tendermint/tendermint/wire"
+	cm "github.com/eris-ltd/eris-db/Godeps/_workspace/src/github.com/tendermint/tendermint/consensus"
+	"github.com/eris-ltd/eris-db/Godeps/_workspace/src/github.com/tendermint/tendermint/p2p"
+	"github.com/eris-ltd/eris-db/Godeps/_workspace/src/github.com/tendermint/tendermint/types"
+	"github.com/eris-ltd/eris-db/Godeps/_workspace/src/github.com/tendermint/tendermint/wire"
 )
 
 // The consensus struct.
diff --git a/erisdb/pipe/events.go b/erisdb/pipe/events.go
index 0b7b8d01cd1faccb30fcd8dd2e99429162e18f94..f2d15bdb6f16bd3a8ec3bfc0403411b3a3955129 100644
--- a/erisdb/pipe/events.go
+++ b/erisdb/pipe/events.go
@@ -1,8 +1,8 @@
 package pipe
 
 import (
-	evts "github.com/tendermint/tendermint/events"
-	"github.com/tendermint/tendermint/types"
+	evts "github.com/eris-ltd/eris-db/Godeps/_workspace/src/github.com/tendermint/tendermint/events"
+	"github.com/eris-ltd/eris-db/Godeps/_workspace/src/github.com/tendermint/tendermint/types"
 )
 
 // TODO improve
diff --git a/erisdb/pipe/namereg.go b/erisdb/pipe/namereg.go
index 1dce4a96ba6a556f18780aa327913765836cd9e7..1fe22dbb51b3df3a6abd9d2ac9b0d3a555d9bd83 100644
--- a/erisdb/pipe/namereg.go
+++ b/erisdb/pipe/namereg.go
@@ -4,9 +4,9 @@ import (
 	"bytes"
 	"encoding/hex"
 	"fmt"
-	cm "github.com/tendermint/tendermint/consensus"
-	ctypes "github.com/tendermint/tendermint/rpc/core/types"
-	types "github.com/tendermint/tendermint/types"
+	cm "github.com/eris-ltd/eris-db/Godeps/_workspace/src/github.com/tendermint/tendermint/consensus"
+	ctypes "github.com/eris-ltd/eris-db/Godeps/_workspace/src/github.com/tendermint/tendermint/rpc/core/types"
+	types "github.com/eris-ltd/eris-db/Godeps/_workspace/src/github.com/tendermint/tendermint/types"
 	"sync"
 )
 
diff --git a/erisdb/pipe/net.go b/erisdb/pipe/net.go
index fe7b6e6f3c0445483b7aaad8f35c193980ef5c01..914b49d1f4022b8f4577502947470220615f0002 100644
--- a/erisdb/pipe/net.go
+++ b/erisdb/pipe/net.go
@@ -1,7 +1,7 @@
 package pipe
 
 import (
-	"github.com/tendermint/tendermint/p2p"
+	"github.com/eris-ltd/eris-db/Godeps/_workspace/src/github.com/tendermint/tendermint/p2p"
 )
 
 // The net struct.
diff --git a/erisdb/pipe/pipe.go b/erisdb/pipe/pipe.go
index c9cdda29538b17c78008247a181a6f3386d0fe62..e01a6788315261f6832c883a040c520d5d3d7dd9 100644
--- a/erisdb/pipe/pipe.go
+++ b/erisdb/pipe/pipe.go
@@ -2,10 +2,10 @@
 package pipe
 
 import (
-	"github.com/tendermint/tendermint/account"
-	"github.com/tendermint/tendermint/node"
-	ctypes "github.com/tendermint/tendermint/rpc/core/types"
-	"github.com/tendermint/tendermint/types"
+	"github.com/eris-ltd/eris-db/Godeps/_workspace/src/github.com/tendermint/tendermint/account"
+	"github.com/eris-ltd/eris-db/Godeps/_workspace/src/github.com/tendermint/tendermint/node"
+	ctypes "github.com/eris-ltd/eris-db/Godeps/_workspace/src/github.com/tendermint/tendermint/rpc/core/types"
+	"github.com/eris-ltd/eris-db/Godeps/_workspace/src/github.com/tendermint/tendermint/types"
 )
 
 type (
@@ -100,7 +100,7 @@ func NewPipe(tNode *node.Node) Pipe {
 	namereg := newNamereg(tNode.ConsensusState())
 	net := newNetwork(tNode.Switch())
 	txs := newTransactor(tNode.EventSwitch(), tNode.ConsensusState(), tNode.MempoolReactor(), events)
-	
+
 	return &PipeImpl{
 		tNode,
 		accounts,
diff --git a/erisdb/pipe/transactor.go b/erisdb/pipe/transactor.go
index 71801e6e6e9bb92ee056345518e4a8b1a2811d90..c406d9c66d775c77bcc54912dbac002f8f8d16cd 100644
--- a/erisdb/pipe/transactor.go
+++ b/erisdb/pipe/transactor.go
@@ -4,14 +4,14 @@ import (
 	"bytes"
 	"encoding/hex"
 	"fmt"
-	"github.com/tendermint/tendermint/account"
-	cmn "github.com/tendermint/tendermint/common"
-	cs "github.com/tendermint/tendermint/consensus"
-	tEvents "github.com/tendermint/tendermint/events"
-	mempl "github.com/tendermint/tendermint/mempool"
-	"github.com/tendermint/tendermint/state"
-	"github.com/tendermint/tendermint/types"
-	"github.com/tendermint/tendermint/vm"
+	"github.com/eris-ltd/eris-db/Godeps/_workspace/src/github.com/tendermint/tendermint/account"
+	cmn "github.com/eris-ltd/eris-db/Godeps/_workspace/src/github.com/tendermint/tendermint/common"
+	cs "github.com/eris-ltd/eris-db/Godeps/_workspace/src/github.com/tendermint/tendermint/consensus"
+	tEvents "github.com/eris-ltd/eris-db/Godeps/_workspace/src/github.com/tendermint/tendermint/events"
+	mempl "github.com/eris-ltd/eris-db/Godeps/_workspace/src/github.com/tendermint/tendermint/mempool"
+	"github.com/eris-ltd/eris-db/Godeps/_workspace/src/github.com/tendermint/tendermint/state"
+	"github.com/eris-ltd/eris-db/Godeps/_workspace/src/github.com/tendermint/tendermint/types"
+	"github.com/eris-ltd/eris-db/Godeps/_workspace/src/github.com/tendermint/tendermint/vm"
 	"sync"
 	"time"
 )
@@ -216,11 +216,11 @@ func (this *transactor) Send(privKey, toAddress []byte, amount int64) (*Receipt,
 	} else {
 		toAddr = toAddress
 	}
-	
+
 	if len(privKey) != 64 {
 		return nil, fmt.Errorf("Private key is not of the right length: %d\n", len(privKey))
 	}
-	
+
 	pk := &[64]byte{}
 	copy(pk[:], privKey)
 	this.txMtx.Lock()
@@ -234,22 +234,22 @@ func (this *transactor) Send(privKey, toAddress []byte, amount int64) (*Receipt,
 	} else {
 		sequence = acc.Sequence + 1
 	}
-	
+
 	tx := types.NewSendTx()
-	
+
 	txInput := &types.TxInput{
 		Address:  pa.Address,
 		Amount:   amount,
 		Sequence: sequence,
 		PubKey:   pa.PubKey,
 	}
-	
+
 	tx.Inputs = append(tx.Inputs, txInput)
-	
+
 	txOutput := &types.TxOutput{toAddr, amount}
-	
-	tx.Outputs = append(tx.Outputs, txOutput);
-	
+
+	tx.Outputs = append(tx.Outputs, txOutput)
+
 	// Got ourselves a tx.
 	txS, errS := this.SignTx(tx, []*account.PrivAccount{pa})
 	if errS != nil {
@@ -263,10 +263,10 @@ func (this *transactor) SendAndHold(privKey, toAddress []byte, amount int64) (*R
 	if tErr != nil {
 		return nil, tErr
 	}
-	
+
 	wc := make(chan *types.SendTx)
 	subId := fmt.Sprintf("%X", rec.TxHash)
-	
+
 	this.eventEmitter.Subscribe(subId, types.EventStringAccOutput(toAddress), func(evt types.EventData) {
 		event := evt.(types.EventDataTx)
 		tx := event.Tx.(*types.SendTx)
diff --git a/erisdb/pipe/types.go b/erisdb/pipe/types.go
index 91ebc6c484123e485b2589c21908771010ca0fb0..ea8e6fa96ad9677e50c69edced594bfd07dde2f6 100644
--- a/erisdb/pipe/types.go
+++ b/erisdb/pipe/types.go
@@ -1,9 +1,9 @@
 package pipe
 
 import (
-	"github.com/tendermint/tendermint/account"
-	csus "github.com/tendermint/tendermint/consensus"
-	"github.com/tendermint/tendermint/types"
+	"github.com/eris-ltd/eris-db/Godeps/_workspace/src/github.com/tendermint/tendermint/account"
+	csus "github.com/eris-ltd/eris-db/Godeps/_workspace/src/github.com/tendermint/tendermint/consensus"
+	"github.com/eris-ltd/eris-db/Godeps/_workspace/src/github.com/tendermint/tendermint/types"
 )
 
 type (
diff --git a/erisdb/restServer.go b/erisdb/restServer.go
index 3b95f3daf7a5a08d78aad2b52a37ca0af4be73d0..5585d572559fc2e1c8caebad3889167939df25c7 100644
--- a/erisdb/restServer.go
+++ b/erisdb/restServer.go
@@ -3,8 +3,8 @@ package erisdb
 import (
 	"encoding/hex"
 	"fmt"
-	"github.com/gin-gonic/gin"
-	"github.com/tendermint/tendermint/types"
+	"github.com/eris-ltd/eris-db/Godeps/_workspace/src/github.com/gin-gonic/gin"
+	"github.com/eris-ltd/eris-db/Godeps/_workspace/src/github.com/tendermint/tendermint/types"
 	ep "github.com/eris-ltd/eris-db/erisdb/pipe"
 	rpc "github.com/eris-ltd/eris-db/rpc"
 	"github.com/eris-ltd/eris-db/server"
@@ -424,9 +424,9 @@ func (this *RestServer) handleCallCode(c *gin.Context) {
 }
 
 func (this *RestServer) handleTransact(c *gin.Context) {
-	
+
 	_, hold := c.Get("hold")
-	
+
 	param := &TransactParam{}
 	errD := this.codec.Decode(param, c.Request.Body)
 	if errD != nil {
@@ -537,7 +537,7 @@ func parseTxModifier(c *gin.Context) {
 	hold := c.Query("hold")
 	if hold == "true" {
 		c.Set("hold", true)
-	} else if (hold != "") {
+	} else if hold != "" {
 		if hold != "false" {
 			c.Writer.WriteHeader(400)
 			c.Writer.Write([]byte("tx hold must be either 'true' or 'false', found: " + hold))
diff --git a/erisdb/serve.go b/erisdb/serve.go
index 68ccb8334059c1010a1b3fe2b4bccc1974a89873..cab5a49f555d3768432af66b857cb6d0c8606b4d 100644
--- a/erisdb/serve.go
+++ b/erisdb/serve.go
@@ -3,12 +3,12 @@
 package erisdb
 
 import (
-	"github.com/tendermint/log15"
-	. "github.com/tendermint/tendermint/common"
-	cfg "github.com/tendermint/tendermint/config"
-	tmcfg "github.com/tendermint/tendermint/config/tendermint"
-	"github.com/tendermint/tendermint/node"
-	"github.com/tendermint/tendermint/p2p"
+	"github.com/eris-ltd/eris-db/Godeps/_workspace/src/github.com/tendermint/log15"
+	. "github.com/eris-ltd/eris-db/Godeps/_workspace/src/github.com/tendermint/tendermint/common"
+	cfg "github.com/eris-ltd/eris-db/Godeps/_workspace/src/github.com/tendermint/tendermint/config"
+	tmcfg "github.com/eris-ltd/eris-db/Godeps/_workspace/src/github.com/tendermint/tendermint/config/tendermint"
+	"github.com/eris-ltd/eris-db/Godeps/_workspace/src/github.com/tendermint/tendermint/node"
+	"github.com/eris-ltd/eris-db/Godeps/_workspace/src/github.com/tendermint/tendermint/p2p"
 	ep "github.com/eris-ltd/eris-db/erisdb/pipe"
 	"github.com/eris-ltd/eris-db/server"
 	"path"
diff --git a/erisdb/wsService.go b/erisdb/wsService.go
index 2af9bca00a382975815a3231da239b392ca237ad..490d284d3e569289d534852a01f30ddc3bee6c8b 100644
--- a/erisdb/wsService.go
+++ b/erisdb/wsService.go
@@ -7,7 +7,7 @@ import (
 	rpc "github.com/eris-ltd/eris-db/rpc"
 	"github.com/eris-ltd/eris-db/server"
 
-	"github.com/tendermint/tendermint/types"
+	"github.com/eris-ltd/eris-db/Godeps/_workspace/src/github.com/tendermint/tendermint/types"
 )
 
 // Used for ErisDb. Implements WebSocketService.
diff --git a/files/files_test.go b/files/files_test.go
index 2d9cdc23ed1646f3acb242904015df3ba1418945..bdfa44265a19b727a8ef9dad251632bcaec26f18 100644
--- a/files/files_test.go
+++ b/files/files_test.go
@@ -2,7 +2,7 @@ package files
 
 import (
 	"bytes"
-	"github.com/stretchr/testify/assert"
+	"github.com/eris-ltd/eris-db/Godeps/_workspace/src/github.com/stretchr/testify/assert"
 	"os"
 	"path"
 	"testing"
diff --git a/files/log.go b/files/log.go
index a18f6b6a6ec7420d469269b33832a2e5cc277a43..9067bf137b741db2a06094b0de429054bfcc493e 100644
--- a/files/log.go
+++ b/files/log.go
@@ -1,7 +1,7 @@
 package files
 
 import (
-	"github.com/tendermint/log15"
+	"github.com/eris-ltd/eris-db/Godeps/_workspace/src/github.com/tendermint/log15"
 )
 
 var log = log15.New("module", "eris/server/files")
diff --git a/rpc/rpc_test.go b/rpc/rpc_test.go
index bfafa4c2f9861f01192de0ad9b9aba05897d304d..a5debf5f78621a45beda0440ebcd95fbfe9bc8e6 100644
--- a/rpc/rpc_test.go
+++ b/rpc/rpc_test.go
@@ -1,7 +1,7 @@
 package rpc
 
 import (
-	"github.com/stretchr/testify/assert"
+	"github.com/eris-ltd/eris-db/Godeps/_workspace/src/github.com/stretchr/testify/assert"
 	"testing"
 )
 
diff --git a/server/config.go b/server/config.go
index 720dddcdc3558da42500a501031bca8b87d4abfc..bd84d4766feb99d6ce55051fcf17a90a788d945a 100644
--- a/server/config.go
+++ b/server/config.go
@@ -1,7 +1,7 @@
 package server
 
 import (
-	"github.com/naoina/toml"
+	"github.com/eris-ltd/eris-db/Godeps/_workspace/src/github.com/naoina/toml"
 	"github.com/eris-ltd/eris-db/files"
 )
 
diff --git a/server/log.go b/server/log.go
index aacad33d92109b6353e54b91b438b3f2f7e746f3..09e6fbdad3708856ff9bfa14bc8e2236a99ba1eb 100644
--- a/server/log.go
+++ b/server/log.go
@@ -1,7 +1,7 @@
 package server
 
 import (
-	"github.com/tendermint/log15"
+	"github.com/eris-ltd/eris-db/Godeps/_workspace/src/github.com/tendermint/log15"
 )
 
 var log = log15.New("module", "eris/server")
diff --git a/server/logging.go b/server/logging.go
index a5a70031af162f749641075bd1dd01e32087946e..8b1ba444e437a70995ea69461d4d3c31e0500228 100644
--- a/server/logging.go
+++ b/server/logging.go
@@ -2,7 +2,7 @@ package server
 
 import (
 	"fmt"
-	"github.com/tendermint/log15"
+	"github.com/eris-ltd/eris-db/Godeps/_workspace/src/github.com/tendermint/log15"
 	"os"
 )
 
diff --git a/server/server.go b/server/server.go
index 87b690a974bb1b66e1be475c898f162842822160..f333b1ffcbc5336199b3135cea926de80784c759 100644
--- a/server/server.go
+++ b/server/server.go
@@ -3,8 +3,8 @@ package server
 import (
 	"crypto/tls"
 	"fmt"
-	"github.com/gin-gonic/gin"
-	cors "github.com/tommy351/gin-cors"
+	"github.com/eris-ltd/eris-db/Godeps/_workspace/src/github.com/gin-gonic/gin"
+	cors "github.com/eris-ltd/eris-db/Godeps/_workspace/src/github.com/tommy351/gin-cors"
 	"github.com/eris-ltd/eris-db/Godeps/_workspace/src/gopkg.in/tylerb/graceful.v1"
 	"net"
 	"net/http"
diff --git a/server/server_test.go b/server/server_test.go
index 05d954b705fe5daf9980c7bd84d9b98dbb5c20b6..55bfb66676a76ad2c610f67874cbb62b0196efcf 100644
--- a/server/server_test.go
+++ b/server/server_test.go
@@ -2,7 +2,7 @@ package server
 
 import (
 	//"fmt"
-	"github.com/stretchr/testify/assert"
+	"github.com/eris-ltd/eris-db/Godeps/_workspace/src/github.com/stretchr/testify/assert"
 	"testing"
 )
 
diff --git a/server/websocket.go b/server/websocket.go
index b37166fdd73c1ebf945830778079a20ceca0b95f..b5d4b4caae74308238f48a5b9ba9ea4f25d25e51 100644
--- a/server/websocket.go
+++ b/server/websocket.go
@@ -2,8 +2,8 @@ package server
 
 import (
 	"fmt"
-	"github.com/gin-gonic/gin"
-	"github.com/gorilla/websocket"
+	"github.com/eris-ltd/eris-db/Godeps/_workspace/src/github.com/gin-gonic/gin"
+	"github.com/eris-ltd/eris-db/Godeps/_workspace/src/github.com/gorilla/websocket"
 	"net/http"
 	"sync"
 	"time"
@@ -223,14 +223,14 @@ func (this *WSSession) readPump() {
 			this.writeCloseChan <- struct{}{}
 			return
 		}
-		
+
 		if msgType != websocket.TextMessage {
 			log.Info("Receiving non text-message from client, closing.")
 			this.writeCloseChan <- struct{}{}
 			return
 		}
-		
-		go func(){
+
+		go func() {
 			// Process the request.
 			this.service.Process(msg, this)
 		}()
@@ -274,16 +274,16 @@ func (this *WSSession) writePump() {
 			}
 		case <-this.writeCloseChan:
 			return
-		// Ticker run out. Time for another ping message.
-		/*
-		case <-ticker.C:
-			if err := this.write(websocket.PingMessage, []byte{}); err != nil {
-				log.Debug("Failed to write ping message to socket. Closing.")
-				return
-			}
+			// Ticker run out. Time for another ping message.
+			/*
+				case <-ticker.C:
+					if err := this.write(websocket.PingMessage, []byte{}); err != nil {
+						log.Debug("Failed to write ping message to socket. Closing.")
+						return
+					}
 			*/
 		}
-		
+
 	}
 }
 
diff --git a/test/filters/filter_test.go b/test/filters/filter_test.go
index ba0905f2d9f1710b82a46d230ac68fec15ca4e1a..adfbc98b2918a47670718af17f831ff86b9c199e 100644
--- a/test/filters/filter_test.go
+++ b/test/filters/filter_test.go
@@ -2,7 +2,7 @@ package filters
 
 import (
 	"fmt"
-	"github.com/stretchr/testify/suite"
+	"github.com/eris-ltd/eris-db/Godeps/_workspace/src/github.com/stretchr/testify/suite"
 	. "github.com/eris-ltd/eris-db/erisdb/pipe"
 	"sync"
 	"testing"
diff --git a/test/mock/mock_web_api_test.go b/test/mock/mock_web_api_test.go
index a4d4f6889f2fc795f08de68ff8ed66f241e59ac1..084c85a889522fff16d1265e3d3a3c492cfbb3e7 100644
--- a/test/mock/mock_web_api_test.go
+++ b/test/mock/mock_web_api_test.go
@@ -5,12 +5,12 @@ import (
 	"bytes"
 	"encoding/hex"
 	// edb "github.com/eris-ltd/erisdb/erisdb"
-	"github.com/gin-gonic/gin"
-	"github.com/stretchr/testify/suite"
-	"github.com/tendermint/log15"
-	"github.com/tendermint/tendermint/account"
-	ctypes "github.com/tendermint/tendermint/rpc/core/types"
-	"github.com/tendermint/tendermint/types"
+	"github.com/eris-ltd/eris-db/Godeps/_workspace/src/github.com/gin-gonic/gin"
+	"github.com/eris-ltd/eris-db/Godeps/_workspace/src/github.com/stretchr/testify/suite"
+	"github.com/eris-ltd/eris-db/Godeps/_workspace/src/github.com/tendermint/log15"
+	"github.com/eris-ltd/eris-db/Godeps/_workspace/src/github.com/tendermint/tendermint/account"
+	ctypes "github.com/eris-ltd/eris-db/Godeps/_workspace/src/github.com/tendermint/tendermint/rpc/core/types"
+	"github.com/eris-ltd/eris-db/Godeps/_workspace/src/github.com/tendermint/tendermint/types"
 	edb "github.com/eris-ltd/eris-db/erisdb"
 	ep "github.com/eris-ltd/eris-db/erisdb/pipe"
 	"github.com/eris-ltd/eris-db/rpc"
diff --git a/test/mock/pipe.go b/test/mock/pipe.go
index b3bac07d5ebbbc955b27ddd54917d884f6e3f723..85aa484c7297a958110703bd8d47ad0ef092671b 100644
--- a/test/mock/pipe.go
+++ b/test/mock/pipe.go
@@ -4,9 +4,9 @@ import (
 	ep "github.com/eris-ltd/eris-db/erisdb/pipe"
 	td "github.com/eris-ltd/eris-db/test/testdata/testdata"
 
-	"github.com/tendermint/tendermint/account"
-	ctypes "github.com/tendermint/tendermint/rpc/core/types"
-	"github.com/tendermint/tendermint/types"
+	"github.com/eris-ltd/eris-db/Godeps/_workspace/src/github.com/tendermint/tendermint/account"
+	ctypes "github.com/eris-ltd/eris-db/Godeps/_workspace/src/github.com/tendermint/tendermint/rpc/core/types"
+	"github.com/eris-ltd/eris-db/Godeps/_workspace/src/github.com/tendermint/tendermint/types"
 )
 
 // Base struct.
@@ -244,7 +244,6 @@ func (this *transactor) TransactAndHold(privKey, address, data []byte, gasLimit,
 	return nil, nil
 }
 
-
 func (this *transactor) Send(privKey, toAddress []byte, amount int64) (*ep.Receipt, error) {
 	return nil, nil
 }
diff --git a/test/server/http_burst_test.go b/test/server/http_burst_test.go
index 2ac5dbcc09a8201c2bde87e2f2114587205408ff..cc415a0e7aefdedbaff975774ca8ab0f88b312e2 100644
--- a/test/server/http_burst_test.go
+++ b/test/server/http_burst_test.go
@@ -2,7 +2,7 @@ package server
 
 import (
 	// "fmt"
-	"github.com/stretchr/testify/assert"
+	"github.com/eris-ltd/eris-db/Godeps/_workspace/src/github.com/stretchr/testify/assert"
 	"net/http"
 	"testing"
 	"time"
diff --git a/test/server/scumbag.go b/test/server/scumbag.go
index 807206012dc390c919a5c88dd26c64c7abb29d65..dbf50eff00cb111f2eb1e60fea15286c7e361e01 100644
--- a/test/server/scumbag.go
+++ b/test/server/scumbag.go
@@ -2,8 +2,8 @@ package server
 
 import (
 	"encoding/json"
-	"github.com/gin-gonic/gin"
-	"github.com/tendermint/log15"
+	"github.com/eris-ltd/eris-db/Godeps/_workspace/src/github.com/gin-gonic/gin"
+	"github.com/eris-ltd/eris-db/Godeps/_workspace/src/github.com/tendermint/log15"
 	"github.com/eris-ltd/eris-db/rpc"
 	"github.com/eris-ltd/eris-db/server"
 	"os"
diff --git a/test/server/ws_burst_test.go b/test/server/ws_burst_test.go
index 3b5749aa245f1010e6fa4e8528be0a60751aad53..2d62401310e52cd5b3b523eec4466b2336e8b458 100644
--- a/test/server/ws_burst_test.go
+++ b/test/server/ws_burst_test.go
@@ -1,7 +1,7 @@
 package server
 
 import (
-	"github.com/stretchr/testify/assert"
+	"github.com/eris-ltd/eris-db/Godeps/_workspace/src/github.com/stretchr/testify/assert"
 	"github.com/eris-ltd/eris-db/client"
 	"github.com/eris-ltd/eris-db/server"
 	"testing"
@@ -102,7 +102,7 @@ func wsClient(doneChan chan bool, errChan chan error) {
 		i++
 	}
 	client.Close()
-	time.Sleep(100*time.Millisecond)
-	
+	time.Sleep(100 * time.Millisecond)
+
 	doneChan <- true
 }
diff --git a/test/testdata/filters/testdata_filters.go b/test/testdata/filters/testdata_filters.go
index a41be1698a616cfc8c9ffbc3f19f1438765424bc..394a16a4e6d773f632cf39addf862c0923aa0392 100644
--- a/test/testdata/filters/testdata_filters.go
+++ b/test/testdata/filters/testdata_filters.go
@@ -4,8 +4,8 @@ import (
 	edb "github.com/eris-ltd/eris-db/erisdb"
 	ep "github.com/eris-ltd/eris-db/erisdb/pipe"
 
-	stypes "github.com/tendermint/tendermint/state/types"
-	"github.com/tendermint/tendermint/types"
+	stypes "github.com/eris-ltd/eris-db/Godeps/_workspace/src/github.com/tendermint/tendermint/state/types"
+	"github.com/eris-ltd/eris-db/Godeps/_workspace/src/github.com/tendermint/tendermint/types"
 )
 
 var testDataJson = `{
diff --git a/test/testdata/testdata/testdata.go b/test/testdata/testdata/testdata.go
index 9affa66d8fb1810ade31b07d8d3a5edb5d2e86bd..2b9ff63c0d9388b064de263fc2c48d6c847ec2e7 100644
--- a/test/testdata/testdata/testdata.go
+++ b/test/testdata/testdata/testdata.go
@@ -1,10 +1,10 @@
 package testdata
 
 import (
-	"github.com/tendermint/tendermint/account"
-	ctypes "github.com/tendermint/tendermint/rpc/core/types"
-	stypes "github.com/tendermint/tendermint/state/types"
-	"github.com/tendermint/tendermint/types"
+	"github.com/eris-ltd/eris-db/Godeps/_workspace/src/github.com/tendermint/tendermint/account"
+	ctypes "github.com/eris-ltd/eris-db/Godeps/_workspace/src/github.com/tendermint/tendermint/rpc/core/types"
+	stypes "github.com/eris-ltd/eris-db/Godeps/_workspace/src/github.com/tendermint/tendermint/state/types"
+	"github.com/eris-ltd/eris-db/Godeps/_workspace/src/github.com/tendermint/tendermint/types"
 	edb "github.com/eris-ltd/eris-db/erisdb"
 	ep "github.com/eris-ltd/eris-db/erisdb/pipe"
 )
diff --git a/test/transacting/transacting_tes.go b/test/transacting/transacting_tes.go
index 69777eac77c3733f0e81fc2f347d9c15b1dd070e..e7fa397b82a8d4a623bd22f6ef1eab3237a7d3eb 100644
--- a/test/transacting/transacting_tes.go
+++ b/test/transacting/transacting_tes.go
@@ -4,11 +4,13 @@ package transacting
 import (
 	"bytes"
 	"fmt"
-	"github.com/stretchr/testify/suite"
+	"github.com/eris-ltd/eris-db/Godeps/_workspace/src/github.com/stretchr/testify/suite"
 	// "github.com/tendermint/tendermint/types"
 	edb "github.com/eris-ltd/eris-db/erisdb"
 	ess "github.com/eris-ltd/eris-db/erisdb/erisdbss"
 	// ep "github.com/eris-ltd/eris-db/erisdb/pipe"
+	"github.com/eris-ltd/eris-db/Godeps/_workspace/src/github.com/gin-gonic/gin"
+	"github.com/eris-ltd/eris-db/Godeps/_workspace/src/github.com/tendermint/log15"
 	"github.com/eris-ltd/eris-db/rpc"
 	"github.com/eris-ltd/eris-db/server"
 	td "github.com/eris-ltd/eris-db/test/testdata/testdata"
@@ -16,10 +18,8 @@ import (
 	"net/http"
 	"os"
 	"path"
-	"testing"
-	"github.com/gin-gonic/gin"
-	"github.com/tendermint/log15"
 	"runtime"
+	"testing"
 )
 
 func init() {
@@ -136,4 +136,4 @@ func (this *TxSuite) postJson(endpoint string, v interface{}) *http.Response {
 
 func TestQuerySuite(t *testing.T) {
 	suite.Run(t, &TxSuite{})
-}
\ No newline at end of file
+}
diff --git a/test/web_api/query_test.go b/test/web_api/query_test.go
index 54d2ce48271faaa8fd98432e9ba9151c9c83ebe1..3acb0a7ee4033d2c12ae1594a94ca9759af0761f 100644
--- a/test/web_api/query_test.go
+++ b/test/web_api/query_test.go
@@ -4,7 +4,7 @@ package web_api
 import (
 	"bytes"
 	"fmt"
-	"github.com/stretchr/testify/suite"
+	"github.com/eris-ltd/eris-db/Godeps/_workspace/src/github.com/stretchr/testify/suite"
 	edb "github.com/eris-ltd/eris-db/erisdb"
 	ess "github.com/eris-ltd/eris-db/erisdb/erisdbss"
 	ep "github.com/eris-ltd/eris-db/erisdb/pipe"
@@ -133,4 +133,4 @@ func generateQuery(fda []*ep.FilterData) string {
 
 func TestQuerySuite(t *testing.T) {
 	suite.Run(t, &QuerySuite{})
-}
\ No newline at end of file
+}
diff --git a/test/web_api/shared.go b/test/web_api/shared.go
index 406fbbcd8ac867c51f4460f10e51410afb038aac..4f08a3c45f73170b113a1cef609d13220fb7a2a0 100644
--- a/test/web_api/shared.go
+++ b/test/web_api/shared.go
@@ -1,8 +1,8 @@
 package web_api
 
 import (
-	"github.com/gin-gonic/gin"
-	"github.com/tendermint/log15"
+	"github.com/eris-ltd/eris-db/Godeps/_workspace/src/github.com/gin-gonic/gin"
+	"github.com/eris-ltd/eris-db/Godeps/_workspace/src/github.com/tendermint/log15"
 	"os"
 	"runtime"
 )
diff --git a/test/web_api/web_api_test.go b/test/web_api/web_api_test.go
index 3c86cfa74716547b45929e3f899b80271f13dfe6..ede734cee1d8b20d38b33db183e2dd7198ffe20c 100644
--- a/test/web_api/web_api_test.go
+++ b/test/web_api/web_api_test.go
@@ -6,9 +6,9 @@ import (
 	"encoding/hex"
 	"fmt"
 	// edb "github.com/eris-ltd/erisdb/erisdb"
-	"github.com/gin-gonic/gin"
-	"github.com/stretchr/testify/suite"
-	"github.com/tendermint/tendermint/account"
+	"github.com/eris-ltd/eris-db/Godeps/_workspace/src/github.com/gin-gonic/gin"
+	"github.com/eris-ltd/eris-db/Godeps/_workspace/src/github.com/stretchr/testify/suite"
+	"github.com/eris-ltd/eris-db/Godeps/_workspace/src/github.com/tendermint/tendermint/account"
 	edb "github.com/eris-ltd/eris-db/erisdb"
 	ess "github.com/eris-ltd/eris-db/erisdb/erisdbss"
 	ep "github.com/eris-ltd/eris-db/erisdb/pipe"
diff --git a/util/util_test.go b/util/util_test.go
index deef5ebb81a9af2c5fe4074d10662ebab3bdb145..69046d219592a4d071331a09855db0c998003e56 100644
--- a/util/util_test.go
+++ b/util/util_test.go
@@ -1,7 +1,7 @@
 package util
 
 import (
-	"github.com/stretchr/testify/assert"
+	"github.com/eris-ltd/eris-db/Godeps/_workspace/src/github.com/stretchr/testify/assert"
 	"testing"
 )