diff --git a/Godeps/Godeps.json b/Godeps/Godeps.json
index ae83a101..ffdab34f 100644
--- a/Godeps/Godeps.json
+++ b/Godeps/Godeps.json
@@ -272,331 +272,331 @@
 		},
 		{
 			"ImportPath": "k8s.io/api/admissionregistration/v1alpha1",
-			"Rev": "794ec3ffa49dd85eddf72ef4581cb9ba572a6b4c"
+			"Rev": "f5c295feaba2cbc946f0bbb8b535fc5f6a0345ee"
 		},
 		{
 			"ImportPath": "k8s.io/api/admissionregistration/v1beta1",
-			"Rev": "794ec3ffa49dd85eddf72ef4581cb9ba572a6b4c"
+			"Rev": "f5c295feaba2cbc946f0bbb8b535fc5f6a0345ee"
 		},
 		{
 			"ImportPath": "k8s.io/api/apps/v1",
-			"Rev": "794ec3ffa49dd85eddf72ef4581cb9ba572a6b4c"
+			"Rev": "f5c295feaba2cbc946f0bbb8b535fc5f6a0345ee"
 		},
 		{
 			"ImportPath": "k8s.io/api/apps/v1beta1",
-			"Rev": "794ec3ffa49dd85eddf72ef4581cb9ba572a6b4c"
+			"Rev": "f5c295feaba2cbc946f0bbb8b535fc5f6a0345ee"
 		},
 		{
 			"ImportPath": "k8s.io/api/apps/v1beta2",
-			"Rev": "794ec3ffa49dd85eddf72ef4581cb9ba572a6b4c"
+			"Rev": "f5c295feaba2cbc946f0bbb8b535fc5f6a0345ee"
 		},
 		{
 			"ImportPath": "k8s.io/api/authentication/v1",
-			"Rev": "794ec3ffa49dd85eddf72ef4581cb9ba572a6b4c"
+			"Rev": "f5c295feaba2cbc946f0bbb8b535fc5f6a0345ee"
 		},
 		{
 			"ImportPath": "k8s.io/api/authentication/v1beta1",
-			"Rev": "794ec3ffa49dd85eddf72ef4581cb9ba572a6b4c"
+			"Rev": "f5c295feaba2cbc946f0bbb8b535fc5f6a0345ee"
 		},
 		{
 			"ImportPath": "k8s.io/api/authorization/v1",
-			"Rev": "794ec3ffa49dd85eddf72ef4581cb9ba572a6b4c"
+			"Rev": "f5c295feaba2cbc946f0bbb8b535fc5f6a0345ee"
 		},
 		{
 			"ImportPath": "k8s.io/api/authorization/v1beta1",
-			"Rev": "794ec3ffa49dd85eddf72ef4581cb9ba572a6b4c"
+			"Rev": "f5c295feaba2cbc946f0bbb8b535fc5f6a0345ee"
 		},
 		{
 			"ImportPath": "k8s.io/api/autoscaling/v1",
-			"Rev": "794ec3ffa49dd85eddf72ef4581cb9ba572a6b4c"
+			"Rev": "f5c295feaba2cbc946f0bbb8b535fc5f6a0345ee"
 		},
 		{
 			"ImportPath": "k8s.io/api/autoscaling/v2beta1",
-			"Rev": "794ec3ffa49dd85eddf72ef4581cb9ba572a6b4c"
+			"Rev": "f5c295feaba2cbc946f0bbb8b535fc5f6a0345ee"
 		},
 		{
 			"ImportPath": "k8s.io/api/batch/v1",
-			"Rev": "794ec3ffa49dd85eddf72ef4581cb9ba572a6b4c"
+			"Rev": "f5c295feaba2cbc946f0bbb8b535fc5f6a0345ee"
 		},
 		{
 			"ImportPath": "k8s.io/api/batch/v1beta1",
-			"Rev": "794ec3ffa49dd85eddf72ef4581cb9ba572a6b4c"
+			"Rev": "f5c295feaba2cbc946f0bbb8b535fc5f6a0345ee"
 		},
 		{
 			"ImportPath": "k8s.io/api/batch/v2alpha1",
-			"Rev": "794ec3ffa49dd85eddf72ef4581cb9ba572a6b4c"
+			"Rev": "f5c295feaba2cbc946f0bbb8b535fc5f6a0345ee"
 		},
 		{
 			"ImportPath": "k8s.io/api/certificates/v1beta1",
-			"Rev": "794ec3ffa49dd85eddf72ef4581cb9ba572a6b4c"
+			"Rev": "f5c295feaba2cbc946f0bbb8b535fc5f6a0345ee"
 		},
 		{
 			"ImportPath": "k8s.io/api/coordination/v1beta1",
-			"Rev": "794ec3ffa49dd85eddf72ef4581cb9ba572a6b4c"
+			"Rev": "f5c295feaba2cbc946f0bbb8b535fc5f6a0345ee"
 		},
 		{
 			"ImportPath": "k8s.io/api/core/v1",
-			"Rev": "794ec3ffa49dd85eddf72ef4581cb9ba572a6b4c"
+			"Rev": "f5c295feaba2cbc946f0bbb8b535fc5f6a0345ee"
 		},
 		{
 			"ImportPath": "k8s.io/api/events/v1beta1",
-			"Rev": "794ec3ffa49dd85eddf72ef4581cb9ba572a6b4c"
+			"Rev": "f5c295feaba2cbc946f0bbb8b535fc5f6a0345ee"
 		},
 		{
 			"ImportPath": "k8s.io/api/extensions/v1beta1",
-			"Rev": "794ec3ffa49dd85eddf72ef4581cb9ba572a6b4c"
+			"Rev": "f5c295feaba2cbc946f0bbb8b535fc5f6a0345ee"
 		},
 		{
 			"ImportPath": "k8s.io/api/imagepolicy/v1alpha1",
-			"Rev": "794ec3ffa49dd85eddf72ef4581cb9ba572a6b4c"
+			"Rev": "f5c295feaba2cbc946f0bbb8b535fc5f6a0345ee"
 		},
 		{
 			"ImportPath": "k8s.io/api/networking/v1",
-			"Rev": "794ec3ffa49dd85eddf72ef4581cb9ba572a6b4c"
+			"Rev": "f5c295feaba2cbc946f0bbb8b535fc5f6a0345ee"
 		},
 		{
 			"ImportPath": "k8s.io/api/policy/v1beta1",
-			"Rev": "794ec3ffa49dd85eddf72ef4581cb9ba572a6b4c"
+			"Rev": "f5c295feaba2cbc946f0bbb8b535fc5f6a0345ee"
 		},
 		{
 			"ImportPath": "k8s.io/api/rbac/v1",
-			"Rev": "794ec3ffa49dd85eddf72ef4581cb9ba572a6b4c"
+			"Rev": "f5c295feaba2cbc946f0bbb8b535fc5f6a0345ee"
 		},
 		{
 			"ImportPath": "k8s.io/api/rbac/v1alpha1",
-			"Rev": "794ec3ffa49dd85eddf72ef4581cb9ba572a6b4c"
+			"Rev": "f5c295feaba2cbc946f0bbb8b535fc5f6a0345ee"
 		},
 		{
 			"ImportPath": "k8s.io/api/rbac/v1beta1",
-			"Rev": "794ec3ffa49dd85eddf72ef4581cb9ba572a6b4c"
+			"Rev": "f5c295feaba2cbc946f0bbb8b535fc5f6a0345ee"
 		},
 		{
 			"ImportPath": "k8s.io/api/scheduling/v1alpha1",
-			"Rev": "794ec3ffa49dd85eddf72ef4581cb9ba572a6b4c"
+			"Rev": "f5c295feaba2cbc946f0bbb8b535fc5f6a0345ee"
 		},
 		{
 			"ImportPath": "k8s.io/api/scheduling/v1beta1",
-			"Rev": "794ec3ffa49dd85eddf72ef4581cb9ba572a6b4c"
+			"Rev": "f5c295feaba2cbc946f0bbb8b535fc5f6a0345ee"
 		},
 		{
 			"ImportPath": "k8s.io/api/settings/v1alpha1",
-			"Rev": "794ec3ffa49dd85eddf72ef4581cb9ba572a6b4c"
+			"Rev": "f5c295feaba2cbc946f0bbb8b535fc5f6a0345ee"
 		},
 		{
 			"ImportPath": "k8s.io/api/storage/v1",
-			"Rev": "794ec3ffa49dd85eddf72ef4581cb9ba572a6b4c"
+			"Rev": "f5c295feaba2cbc946f0bbb8b535fc5f6a0345ee"
 		},
 		{
 			"ImportPath": "k8s.io/api/storage/v1alpha1",
-			"Rev": "794ec3ffa49dd85eddf72ef4581cb9ba572a6b4c"
+			"Rev": "f5c295feaba2cbc946f0bbb8b535fc5f6a0345ee"
 		},
 		{
 			"ImportPath": "k8s.io/api/storage/v1beta1",
-			"Rev": "794ec3ffa49dd85eddf72ef4581cb9ba572a6b4c"
+			"Rev": "f5c295feaba2cbc946f0bbb8b535fc5f6a0345ee"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/api/apitesting",
-			"Rev": "ef51ab160544f9d05b68e132a4af0b0fab459954"
+			"Rev": "ac4f7e0decfc7dbc613748c40f1bc938da71853b"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/api/apitesting/fuzzer",
-			"Rev": "ef51ab160544f9d05b68e132a4af0b0fab459954"
+			"Rev": "ac4f7e0decfc7dbc613748c40f1bc938da71853b"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/api/apitesting/roundtrip",
-			"Rev": "ef51ab160544f9d05b68e132a4af0b0fab459954"
+			"Rev": "ac4f7e0decfc7dbc613748c40f1bc938da71853b"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/api/equality",
-			"Rev": "ef51ab160544f9d05b68e132a4af0b0fab459954"
+			"Rev": "ac4f7e0decfc7dbc613748c40f1bc938da71853b"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/api/errors",
-			"Rev": "ef51ab160544f9d05b68e132a4af0b0fab459954"
+			"Rev": "ac4f7e0decfc7dbc613748c40f1bc938da71853b"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/api/meta",
-			"Rev": "ef51ab160544f9d05b68e132a4af0b0fab459954"
+			"Rev": "ac4f7e0decfc7dbc613748c40f1bc938da71853b"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/api/resource",
-			"Rev": "ef51ab160544f9d05b68e132a4af0b0fab459954"
+			"Rev": "ac4f7e0decfc7dbc613748c40f1bc938da71853b"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/apis/meta/fuzzer",
-			"Rev": "ef51ab160544f9d05b68e132a4af0b0fab459954"
+			"Rev": "ac4f7e0decfc7dbc613748c40f1bc938da71853b"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/apis/meta/internalversion",
-			"Rev": "ef51ab160544f9d05b68e132a4af0b0fab459954"
+			"Rev": "ac4f7e0decfc7dbc613748c40f1bc938da71853b"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/apis/meta/v1",
-			"Rev": "ef51ab160544f9d05b68e132a4af0b0fab459954"
+			"Rev": "ac4f7e0decfc7dbc613748c40f1bc938da71853b"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured",
-			"Rev": "ef51ab160544f9d05b68e132a4af0b0fab459954"
+			"Rev": "ac4f7e0decfc7dbc613748c40f1bc938da71853b"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/apis/meta/v1beta1",
-			"Rev": "ef51ab160544f9d05b68e132a4af0b0fab459954"
+			"Rev": "ac4f7e0decfc7dbc613748c40f1bc938da71853b"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/conversion",
-			"Rev": "ef51ab160544f9d05b68e132a4af0b0fab459954"
+			"Rev": "ac4f7e0decfc7dbc613748c40f1bc938da71853b"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/conversion/queryparams",
-			"Rev": "ef51ab160544f9d05b68e132a4af0b0fab459954"
+			"Rev": "ac4f7e0decfc7dbc613748c40f1bc938da71853b"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/fields",
-			"Rev": "ef51ab160544f9d05b68e132a4af0b0fab459954"
+			"Rev": "ac4f7e0decfc7dbc613748c40f1bc938da71853b"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/labels",
-			"Rev": "ef51ab160544f9d05b68e132a4af0b0fab459954"
+			"Rev": "ac4f7e0decfc7dbc613748c40f1bc938da71853b"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/runtime",
-			"Rev": "ef51ab160544f9d05b68e132a4af0b0fab459954"
+			"Rev": "ac4f7e0decfc7dbc613748c40f1bc938da71853b"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/runtime/schema",
-			"Rev": "ef51ab160544f9d05b68e132a4af0b0fab459954"
+			"Rev": "ac4f7e0decfc7dbc613748c40f1bc938da71853b"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer",
-			"Rev": "ef51ab160544f9d05b68e132a4af0b0fab459954"
+			"Rev": "ac4f7e0decfc7dbc613748c40f1bc938da71853b"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer/json",
-			"Rev": "ef51ab160544f9d05b68e132a4af0b0fab459954"
+			"Rev": "ac4f7e0decfc7dbc613748c40f1bc938da71853b"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer/protobuf",
-			"Rev": "ef51ab160544f9d05b68e132a4af0b0fab459954"
+			"Rev": "ac4f7e0decfc7dbc613748c40f1bc938da71853b"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer/recognizer",
-			"Rev": "ef51ab160544f9d05b68e132a4af0b0fab459954"
+			"Rev": "ac4f7e0decfc7dbc613748c40f1bc938da71853b"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer/streaming",
-			"Rev": "ef51ab160544f9d05b68e132a4af0b0fab459954"
+			"Rev": "ac4f7e0decfc7dbc613748c40f1bc938da71853b"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer/versioning",
-			"Rev": "ef51ab160544f9d05b68e132a4af0b0fab459954"
+			"Rev": "ac4f7e0decfc7dbc613748c40f1bc938da71853b"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/selection",
-			"Rev": "ef51ab160544f9d05b68e132a4af0b0fab459954"
+			"Rev": "ac4f7e0decfc7dbc613748c40f1bc938da71853b"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/types",
-			"Rev": "ef51ab160544f9d05b68e132a4af0b0fab459954"
+			"Rev": "ac4f7e0decfc7dbc613748c40f1bc938da71853b"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/cache",
-			"Rev": "ef51ab160544f9d05b68e132a4af0b0fab459954"
+			"Rev": "ac4f7e0decfc7dbc613748c40f1bc938da71853b"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/clock",
-			"Rev": "ef51ab160544f9d05b68e132a4af0b0fab459954"
+			"Rev": "ac4f7e0decfc7dbc613748c40f1bc938da71853b"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/diff",
-			"Rev": "ef51ab160544f9d05b68e132a4af0b0fab459954"
+			"Rev": "ac4f7e0decfc7dbc613748c40f1bc938da71853b"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/errors",
-			"Rev": "ef51ab160544f9d05b68e132a4af0b0fab459954"
+			"Rev": "ac4f7e0decfc7dbc613748c40f1bc938da71853b"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/framer",
-			"Rev": "ef51ab160544f9d05b68e132a4af0b0fab459954"
+			"Rev": "ac4f7e0decfc7dbc613748c40f1bc938da71853b"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/httpstream",
-			"Rev": "ef51ab160544f9d05b68e132a4af0b0fab459954"
+			"Rev": "ac4f7e0decfc7dbc613748c40f1bc938da71853b"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/httpstream/spdy",
-			"Rev": "ef51ab160544f9d05b68e132a4af0b0fab459954"
+			"Rev": "ac4f7e0decfc7dbc613748c40f1bc938da71853b"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/intstr",
-			"Rev": "ef51ab160544f9d05b68e132a4af0b0fab459954"
+			"Rev": "ac4f7e0decfc7dbc613748c40f1bc938da71853b"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/json",
-			"Rev": "ef51ab160544f9d05b68e132a4af0b0fab459954"
+			"Rev": "ac4f7e0decfc7dbc613748c40f1bc938da71853b"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/mergepatch",
-			"Rev": "ef51ab160544f9d05b68e132a4af0b0fab459954"
+			"Rev": "ac4f7e0decfc7dbc613748c40f1bc938da71853b"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/naming",
-			"Rev": "ef51ab160544f9d05b68e132a4af0b0fab459954"
+			"Rev": "ac4f7e0decfc7dbc613748c40f1bc938da71853b"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/net",
-			"Rev": "ef51ab160544f9d05b68e132a4af0b0fab459954"
+			"Rev": "ac4f7e0decfc7dbc613748c40f1bc938da71853b"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/remotecommand",
-			"Rev": "ef51ab160544f9d05b68e132a4af0b0fab459954"
+			"Rev": "ac4f7e0decfc7dbc613748c40f1bc938da71853b"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/runtime",
-			"Rev": "ef51ab160544f9d05b68e132a4af0b0fab459954"
+			"Rev": "ac4f7e0decfc7dbc613748c40f1bc938da71853b"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/sets",
-			"Rev": "ef51ab160544f9d05b68e132a4af0b0fab459954"
+			"Rev": "ac4f7e0decfc7dbc613748c40f1bc938da71853b"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/strategicpatch",
-			"Rev": "ef51ab160544f9d05b68e132a4af0b0fab459954"
+			"Rev": "ac4f7e0decfc7dbc613748c40f1bc938da71853b"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/validation",
-			"Rev": "ef51ab160544f9d05b68e132a4af0b0fab459954"
+			"Rev": "ac4f7e0decfc7dbc613748c40f1bc938da71853b"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/validation/field",
-			"Rev": "ef51ab160544f9d05b68e132a4af0b0fab459954"
+			"Rev": "ac4f7e0decfc7dbc613748c40f1bc938da71853b"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/wait",
-			"Rev": "ef51ab160544f9d05b68e132a4af0b0fab459954"
+			"Rev": "ac4f7e0decfc7dbc613748c40f1bc938da71853b"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/yaml",
-			"Rev": "ef51ab160544f9d05b68e132a4af0b0fab459954"
+			"Rev": "ac4f7e0decfc7dbc613748c40f1bc938da71853b"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/version",
-			"Rev": "ef51ab160544f9d05b68e132a4af0b0fab459954"
+			"Rev": "ac4f7e0decfc7dbc613748c40f1bc938da71853b"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/watch",
-			"Rev": "ef51ab160544f9d05b68e132a4af0b0fab459954"
+			"Rev": "ac4f7e0decfc7dbc613748c40f1bc938da71853b"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/third_party/forked/golang/json",
-			"Rev": "ef51ab160544f9d05b68e132a4af0b0fab459954"
+			"Rev": "ac4f7e0decfc7dbc613748c40f1bc938da71853b"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/third_party/forked/golang/netutil",
-			"Rev": "ef51ab160544f9d05b68e132a4af0b0fab459954"
+			"Rev": "ac4f7e0decfc7dbc613748c40f1bc938da71853b"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/third_party/forked/golang/reflect",
-			"Rev": "ef51ab160544f9d05b68e132a4af0b0fab459954"
+			"Rev": "ac4f7e0decfc7dbc613748c40f1bc938da71853b"
 		},
 		{
 			"ImportPath": "k8s.io/kube-openapi/pkg/util/proto",
diff --git a/rest/request.go b/rest/request.go
index c593a387..69ce1c75 100644
--- a/rest/request.go
+++ b/rest/request.go
@@ -198,7 +198,7 @@ func (r *Request) Throttle(limiter flowcontrol.RateLimiter) *Request {
 	return r
 }
 
-// SubResource sets a sub-resource path which can be multiple segments segment after the resource
+// SubResource sets a sub-resource path which can be multiple segments after the resource
 // name but before the suffix.
 func (r *Request) SubResource(subresources ...string) *Request {
 	if r.err != nil {