diff --git a/Gopkg.lock b/Gopkg.lock
index 921ff4c37..b157e2c4d 100644
--- a/Gopkg.lock
+++ b/Gopkg.lock
@@ -1,4 +1,5 @@
-memo = "e0227ed773a9f6c56d1bfac9de1d87c2a74ce142e418b661b74931d2e2b20945"
+# This file is autogenerated, do not edit; changes may be undone by the next 'dep ensure'.
+
 
 [[projects]]
   branch = "master"
@@ -245,3 +246,10 @@ memo = "e0227ed773a9f6c56d1bfac9de1d87c2a74ce142e418b661b74931d2e2b20945"
   name = "gopkg.in/yaml.v2"
   packages = ["."]
   revision = "cd8b52f8269e0feb286dfeef29f8fe4d5b397e0b"
+
+[solve-meta]
+  analyzer-name = "dep"
+  analyzer-version = 1
+  inputs-digest = "e0227ed773a9f6c56d1bfac9de1d87c2a74ce142e418b661b74931d2e2b20945"
+  solver-name = "gps-cdcl"
+  solver-version = 1
diff --git a/Gopkg.toml b/Gopkg.toml
index 89da11a21..a8a2e9bba 100644
--- a/Gopkg.toml
+++ b/Gopkg.toml
@@ -14,7 +14,7 @@
 
 ## Dependencies define constraints on dependent projects. They are respected by
 ## dep whether coming from the Gopkg.toml of the current project or a dependency.
-# [[dependencies]]
+# [[constraint]]
 ## Required: the root import path of the project being constrained.
 # name = "github.com/user/project"
 #
@@ -27,12 +27,12 @@
 ## Optional: an alternate location (URL or import path) for the project's source.
 # source = "https://github.com/myfork/package.git"
 
-## Overrides have the same structure as [[dependencies]], but supercede all
-## [[dependencies]] declarations from all projects. Only the current project's
-## [[overrides]] are applied.
+## Overrides have the same structure as [[constraint]], but supercede all
+## [[constraint]] declarations from all projects. Only the current project's
+## [[override]] are applied.
 ##
 ## Overrides are a sledgehammer. Use them only as a last resort.
-# [[overrides]]
+# [[override]]
 ## Required: the root import path of the project being constrained.
 # name = "github.com/user/project"
 #
@@ -51,90 +51,90 @@
 
 
 
-[[dependencies]]
+[[constraint]]
   branch = "master"
   name = "bazil.org/fuse"
 
-[[dependencies]]
+[[constraint]]
   branch = "master"
   name = "github.com/Unknwon/goconfig"
 
-[[dependencies]]
+[[constraint]]
   branch = "master"
   name = "github.com/VividCortex/ewma"
 
-[[dependencies]]
+[[constraint]]
   branch = "master"
   name = "github.com/aws/aws-sdk-go"
 
-[[dependencies]]
+[[constraint]]
   branch = "master"
   name = "github.com/ncw/go-acd"
 
-[[dependencies]]
+[[constraint]]
   branch = "master"
   name = "github.com/ncw/swift"
 
-[[dependencies]]
+[[constraint]]
   branch = "master"
   name = "github.com/pkg/errors"
 
-[[dependencies]]
+[[constraint]]
   branch = "master"
   name = "github.com/pkg/sftp"
 
-[[dependencies]]
+[[constraint]]
   branch = "master"
   name = "github.com/rfjakob/eme"
 
-[[dependencies]]
+[[constraint]]
   branch = "master"
   name = "github.com/skratchdot/open-golang"
 
-[[dependencies]]
+[[constraint]]
   branch = "master"
   name = "github.com/spf13/cobra"
 
-[[dependencies]]
+[[constraint]]
   branch = "master"
   name = "github.com/spf13/pflag"
 
-[[dependencies]]
+[[constraint]]
   branch = "master"
   name = "github.com/stacktic/dropbox"
 
-[[dependencies]]
+[[constraint]]
   branch = "master"
   name = "github.com/stretchr/testify"
 
-[[dependencies]]
+[[constraint]]
   branch = "master"
   name = "github.com/tsenart/tb"
 
-[[dependencies]]
+[[constraint]]
   branch = "master"
   name = "golang.org/x/crypto"
 
-[[dependencies]]
+[[constraint]]
   branch = "master"
   name = "golang.org/x/net"
 
-[[dependencies]]
+[[constraint]]
   branch = "master"
   name = "golang.org/x/oauth2"
 
-[[dependencies]]
+[[constraint]]
   branch = "master"
   name = "golang.org/x/sys"
 
-[[dependencies]]
+[[constraint]]
   branch = "master"
   name = "golang.org/x/text"
 
-[[dependencies]]
+[[constraint]]
   branch = "master"
   name = "google.golang.org/api"
 
-[[dependencies]]
+[[constraint]]
   branch = "master"
   name = "github.com/ncw/dropbox-sdk-go-unofficial"