diff --git a/Godeps/Godeps.json b/Godeps/Godeps.json
index d8c081bd..08154465 100644
--- a/Godeps/Godeps.json
+++ b/Godeps/Godeps.json
@@ -472,195 +472,195 @@
     },
     {
       "ImportPath": "k8s.io/apimachinery/pkg/api/equality",
-      "Rev": "429c5e743dc2bf27fc89e2d0c56dec9c3bc03859"
+      "Rev": "f65a69e51385565c76e8ccb7730f96d4c4dd96a6"
     },
     {
       "ImportPath": "k8s.io/apimachinery/pkg/api/errors",
-      "Rev": "429c5e743dc2bf27fc89e2d0c56dec9c3bc03859"
+      "Rev": "f65a69e51385565c76e8ccb7730f96d4c4dd96a6"
     },
     {
       "ImportPath": "k8s.io/apimachinery/pkg/api/meta",
-      "Rev": "429c5e743dc2bf27fc89e2d0c56dec9c3bc03859"
+      "Rev": "f65a69e51385565c76e8ccb7730f96d4c4dd96a6"
     },
     {
       "ImportPath": "k8s.io/apimachinery/pkg/api/resource",
-      "Rev": "429c5e743dc2bf27fc89e2d0c56dec9c3bc03859"
+      "Rev": "f65a69e51385565c76e8ccb7730f96d4c4dd96a6"
     },
     {
       "ImportPath": "k8s.io/apimachinery/pkg/apimachinery",
-      "Rev": "429c5e743dc2bf27fc89e2d0c56dec9c3bc03859"
+      "Rev": "f65a69e51385565c76e8ccb7730f96d4c4dd96a6"
     },
     {
       "ImportPath": "k8s.io/apimachinery/pkg/apimachinery/registered",
-      "Rev": "429c5e743dc2bf27fc89e2d0c56dec9c3bc03859"
+      "Rev": "f65a69e51385565c76e8ccb7730f96d4c4dd96a6"
     },
     {
       "ImportPath": "k8s.io/apimachinery/pkg/apis/meta/v1",
-      "Rev": "429c5e743dc2bf27fc89e2d0c56dec9c3bc03859"
+      "Rev": "f65a69e51385565c76e8ccb7730f96d4c4dd96a6"
     },
     {
       "ImportPath": "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured",
-      "Rev": "429c5e743dc2bf27fc89e2d0c56dec9c3bc03859"
+      "Rev": "f65a69e51385565c76e8ccb7730f96d4c4dd96a6"
     },
     {
       "ImportPath": "k8s.io/apimachinery/pkg/apis/meta/v1alpha1",
-      "Rev": "429c5e743dc2bf27fc89e2d0c56dec9c3bc03859"
+      "Rev": "f65a69e51385565c76e8ccb7730f96d4c4dd96a6"
     },
     {
       "ImportPath": "k8s.io/apimachinery/pkg/conversion",
-      "Rev": "429c5e743dc2bf27fc89e2d0c56dec9c3bc03859"
+      "Rev": "f65a69e51385565c76e8ccb7730f96d4c4dd96a6"
     },
     {
       "ImportPath": "k8s.io/apimachinery/pkg/conversion/queryparams",
-      "Rev": "429c5e743dc2bf27fc89e2d0c56dec9c3bc03859"
+      "Rev": "f65a69e51385565c76e8ccb7730f96d4c4dd96a6"
     },
     {
       "ImportPath": "k8s.io/apimachinery/pkg/conversion/unstructured",
-      "Rev": "429c5e743dc2bf27fc89e2d0c56dec9c3bc03859"
+      "Rev": "f65a69e51385565c76e8ccb7730f96d4c4dd96a6"
     },
     {
       "ImportPath": "k8s.io/apimachinery/pkg/fields",
-      "Rev": "429c5e743dc2bf27fc89e2d0c56dec9c3bc03859"
+      "Rev": "f65a69e51385565c76e8ccb7730f96d4c4dd96a6"
     },
     {
       "ImportPath": "k8s.io/apimachinery/pkg/labels",
-      "Rev": "429c5e743dc2bf27fc89e2d0c56dec9c3bc03859"
+      "Rev": "f65a69e51385565c76e8ccb7730f96d4c4dd96a6"
     },
     {
       "ImportPath": "k8s.io/apimachinery/pkg/runtime",
-      "Rev": "429c5e743dc2bf27fc89e2d0c56dec9c3bc03859"
+      "Rev": "f65a69e51385565c76e8ccb7730f96d4c4dd96a6"
     },
     {
       "ImportPath": "k8s.io/apimachinery/pkg/runtime/schema",
-      "Rev": "429c5e743dc2bf27fc89e2d0c56dec9c3bc03859"
+      "Rev": "f65a69e51385565c76e8ccb7730f96d4c4dd96a6"
     },
     {
       "ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer",
-      "Rev": "429c5e743dc2bf27fc89e2d0c56dec9c3bc03859"
+      "Rev": "f65a69e51385565c76e8ccb7730f96d4c4dd96a6"
     },
     {
       "ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer/json",
-      "Rev": "429c5e743dc2bf27fc89e2d0c56dec9c3bc03859"
+      "Rev": "f65a69e51385565c76e8ccb7730f96d4c4dd96a6"
     },
     {
       "ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer/protobuf",
-      "Rev": "429c5e743dc2bf27fc89e2d0c56dec9c3bc03859"
+      "Rev": "f65a69e51385565c76e8ccb7730f96d4c4dd96a6"
     },
     {
       "ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer/recognizer",
-      "Rev": "429c5e743dc2bf27fc89e2d0c56dec9c3bc03859"
+      "Rev": "f65a69e51385565c76e8ccb7730f96d4c4dd96a6"
     },
     {
       "ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer/streaming",
-      "Rev": "429c5e743dc2bf27fc89e2d0c56dec9c3bc03859"
+      "Rev": "f65a69e51385565c76e8ccb7730f96d4c4dd96a6"
     },
     {
       "ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer/versioning",
-      "Rev": "429c5e743dc2bf27fc89e2d0c56dec9c3bc03859"
+      "Rev": "f65a69e51385565c76e8ccb7730f96d4c4dd96a6"
     },
     {
       "ImportPath": "k8s.io/apimachinery/pkg/selection",
-      "Rev": "429c5e743dc2bf27fc89e2d0c56dec9c3bc03859"
+      "Rev": "f65a69e51385565c76e8ccb7730f96d4c4dd96a6"
     },
     {
       "ImportPath": "k8s.io/apimachinery/pkg/types",
-      "Rev": "429c5e743dc2bf27fc89e2d0c56dec9c3bc03859"
+      "Rev": "f65a69e51385565c76e8ccb7730f96d4c4dd96a6"
     },
     {
       "ImportPath": "k8s.io/apimachinery/pkg/util/cache",
-      "Rev": "429c5e743dc2bf27fc89e2d0c56dec9c3bc03859"
+      "Rev": "f65a69e51385565c76e8ccb7730f96d4c4dd96a6"
     },
     {
       "ImportPath": "k8s.io/apimachinery/pkg/util/clock",
-      "Rev": "429c5e743dc2bf27fc89e2d0c56dec9c3bc03859"
+      "Rev": "f65a69e51385565c76e8ccb7730f96d4c4dd96a6"
     },
     {
       "ImportPath": "k8s.io/apimachinery/pkg/util/diff",
-      "Rev": "429c5e743dc2bf27fc89e2d0c56dec9c3bc03859"
+      "Rev": "f65a69e51385565c76e8ccb7730f96d4c4dd96a6"
     },
     {
       "ImportPath": "k8s.io/apimachinery/pkg/util/errors",
-      "Rev": "429c5e743dc2bf27fc89e2d0c56dec9c3bc03859"
+      "Rev": "f65a69e51385565c76e8ccb7730f96d4c4dd96a6"
     },
     {
       "ImportPath": "k8s.io/apimachinery/pkg/util/framer",
-      "Rev": "429c5e743dc2bf27fc89e2d0c56dec9c3bc03859"
+      "Rev": "f65a69e51385565c76e8ccb7730f96d4c4dd96a6"
     },
     {
       "ImportPath": "k8s.io/apimachinery/pkg/util/httpstream",
-      "Rev": "429c5e743dc2bf27fc89e2d0c56dec9c3bc03859"
+      "Rev": "f65a69e51385565c76e8ccb7730f96d4c4dd96a6"
     },
     {
       "ImportPath": "k8s.io/apimachinery/pkg/util/httpstream/spdy",
-      "Rev": "429c5e743dc2bf27fc89e2d0c56dec9c3bc03859"
+      "Rev": "f65a69e51385565c76e8ccb7730f96d4c4dd96a6"
     },
     {
       "ImportPath": "k8s.io/apimachinery/pkg/util/intstr",
-      "Rev": "429c5e743dc2bf27fc89e2d0c56dec9c3bc03859"
+      "Rev": "f65a69e51385565c76e8ccb7730f96d4c4dd96a6"
     },
     {
       "ImportPath": "k8s.io/apimachinery/pkg/util/json",
-      "Rev": "429c5e743dc2bf27fc89e2d0c56dec9c3bc03859"
+      "Rev": "f65a69e51385565c76e8ccb7730f96d4c4dd96a6"
     },
     {
       "ImportPath": "k8s.io/apimachinery/pkg/util/mergepatch",
-      "Rev": "429c5e743dc2bf27fc89e2d0c56dec9c3bc03859"
+      "Rev": "f65a69e51385565c76e8ccb7730f96d4c4dd96a6"
     },
     {
       "ImportPath": "k8s.io/apimachinery/pkg/util/net",
-      "Rev": "429c5e743dc2bf27fc89e2d0c56dec9c3bc03859"
+      "Rev": "f65a69e51385565c76e8ccb7730f96d4c4dd96a6"
     },
     {
       "ImportPath": "k8s.io/apimachinery/pkg/util/remotecommand",
-      "Rev": "429c5e743dc2bf27fc89e2d0c56dec9c3bc03859"
+      "Rev": "f65a69e51385565c76e8ccb7730f96d4c4dd96a6"
     },
     {
       "ImportPath": "k8s.io/apimachinery/pkg/util/runtime",
-      "Rev": "429c5e743dc2bf27fc89e2d0c56dec9c3bc03859"
+      "Rev": "f65a69e51385565c76e8ccb7730f96d4c4dd96a6"
     },
     {
       "ImportPath": "k8s.io/apimachinery/pkg/util/sets",
-      "Rev": "429c5e743dc2bf27fc89e2d0c56dec9c3bc03859"
+      "Rev": "f65a69e51385565c76e8ccb7730f96d4c4dd96a6"
     },
     {
       "ImportPath": "k8s.io/apimachinery/pkg/util/strategicpatch",
-      "Rev": "429c5e743dc2bf27fc89e2d0c56dec9c3bc03859"
+      "Rev": "f65a69e51385565c76e8ccb7730f96d4c4dd96a6"
     },
     {
       "ImportPath": "k8s.io/apimachinery/pkg/util/validation",
-      "Rev": "429c5e743dc2bf27fc89e2d0c56dec9c3bc03859"
+      "Rev": "f65a69e51385565c76e8ccb7730f96d4c4dd96a6"
     },
     {
       "ImportPath": "k8s.io/apimachinery/pkg/util/validation/field",
-      "Rev": "429c5e743dc2bf27fc89e2d0c56dec9c3bc03859"
+      "Rev": "f65a69e51385565c76e8ccb7730f96d4c4dd96a6"
     },
     {
       "ImportPath": "k8s.io/apimachinery/pkg/util/wait",
-      "Rev": "429c5e743dc2bf27fc89e2d0c56dec9c3bc03859"
+      "Rev": "f65a69e51385565c76e8ccb7730f96d4c4dd96a6"
     },
     {
       "ImportPath": "k8s.io/apimachinery/pkg/util/yaml",
-      "Rev": "429c5e743dc2bf27fc89e2d0c56dec9c3bc03859"
+      "Rev": "f65a69e51385565c76e8ccb7730f96d4c4dd96a6"
     },
     {
       "ImportPath": "k8s.io/apimachinery/pkg/version",
-      "Rev": "429c5e743dc2bf27fc89e2d0c56dec9c3bc03859"
+      "Rev": "f65a69e51385565c76e8ccb7730f96d4c4dd96a6"
     },
     {
       "ImportPath": "k8s.io/apimachinery/pkg/watch",
-      "Rev": "429c5e743dc2bf27fc89e2d0c56dec9c3bc03859"
+      "Rev": "f65a69e51385565c76e8ccb7730f96d4c4dd96a6"
     },
     {
       "ImportPath": "k8s.io/apimachinery/third_party/forked/golang/json",
-      "Rev": "429c5e743dc2bf27fc89e2d0c56dec9c3bc03859"
+      "Rev": "f65a69e51385565c76e8ccb7730f96d4c4dd96a6"
     },
     {
       "ImportPath": "k8s.io/apimachinery/third_party/forked/golang/netutil",
-      "Rev": "429c5e743dc2bf27fc89e2d0c56dec9c3bc03859"
+      "Rev": "f65a69e51385565c76e8ccb7730f96d4c4dd96a6"
     },
     {
       "ImportPath": "k8s.io/apimachinery/third_party/forked/golang/reflect",
-      "Rev": "429c5e743dc2bf27fc89e2d0c56dec9c3bc03859"
+      "Rev": "f65a69e51385565c76e8ccb7730f96d4c4dd96a6"
     },
     {
       "ImportPath": "k8s.io/kube-openapi/pkg/common",
diff --git a/tools/clientcmd/overrides.go b/tools/clientcmd/overrides.go
index 963ac8fa..db831440 100644
--- a/tools/clientcmd/overrides.go
+++ b/tools/clientcmd/overrides.go
@@ -36,7 +36,7 @@ type ConfigOverrides struct {
 	Timeout         string
 }
 
-// ConfigOverrideFlags holds the flag names to be used for binding command line flags.  Notice that this structure tightly
+// ConfigOverrideFlags holds the flag names to be used for binding command line flags. Notice that this structure tightly
 // corresponds to ConfigOverrides
 type ConfigOverrideFlags struct {
 	AuthOverrideFlags    AuthOverrideFlags