diff --git a/Godeps/Godeps.json b/Godeps/Godeps.json
index df595602..236bfbe4 100644
--- a/Godeps/Godeps.json
+++ b/Godeps/Godeps.json
@@ -404,207 +404,207 @@
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/api/apitesting",
-			"Rev": "eb8c8024849baa3681995b2b0bd4da7ea1734ace"
+			"Rev": "f1a02064268befe9cb07b02128ff1b6c24041bec"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/api/apitesting/fuzzer",
-			"Rev": "eb8c8024849baa3681995b2b0bd4da7ea1734ace"
+			"Rev": "f1a02064268befe9cb07b02128ff1b6c24041bec"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/api/apitesting/roundtrip",
-			"Rev": "eb8c8024849baa3681995b2b0bd4da7ea1734ace"
+			"Rev": "f1a02064268befe9cb07b02128ff1b6c24041bec"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/api/equality",
-			"Rev": "eb8c8024849baa3681995b2b0bd4da7ea1734ace"
+			"Rev": "f1a02064268befe9cb07b02128ff1b6c24041bec"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/api/errors",
-			"Rev": "eb8c8024849baa3681995b2b0bd4da7ea1734ace"
+			"Rev": "f1a02064268befe9cb07b02128ff1b6c24041bec"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/api/meta",
-			"Rev": "eb8c8024849baa3681995b2b0bd4da7ea1734ace"
+			"Rev": "f1a02064268befe9cb07b02128ff1b6c24041bec"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/api/resource",
-			"Rev": "eb8c8024849baa3681995b2b0bd4da7ea1734ace"
+			"Rev": "f1a02064268befe9cb07b02128ff1b6c24041bec"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/apis/meta/fuzzer",
-			"Rev": "eb8c8024849baa3681995b2b0bd4da7ea1734ace"
+			"Rev": "f1a02064268befe9cb07b02128ff1b6c24041bec"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/apis/meta/internalversion",
-			"Rev": "eb8c8024849baa3681995b2b0bd4da7ea1734ace"
+			"Rev": "f1a02064268befe9cb07b02128ff1b6c24041bec"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/apis/meta/v1",
-			"Rev": "eb8c8024849baa3681995b2b0bd4da7ea1734ace"
+			"Rev": "f1a02064268befe9cb07b02128ff1b6c24041bec"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured",
-			"Rev": "eb8c8024849baa3681995b2b0bd4da7ea1734ace"
+			"Rev": "f1a02064268befe9cb07b02128ff1b6c24041bec"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/apis/meta/v1beta1",
-			"Rev": "eb8c8024849baa3681995b2b0bd4da7ea1734ace"
+			"Rev": "f1a02064268befe9cb07b02128ff1b6c24041bec"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/conversion",
-			"Rev": "eb8c8024849baa3681995b2b0bd4da7ea1734ace"
+			"Rev": "f1a02064268befe9cb07b02128ff1b6c24041bec"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/conversion/queryparams",
-			"Rev": "eb8c8024849baa3681995b2b0bd4da7ea1734ace"
+			"Rev": "f1a02064268befe9cb07b02128ff1b6c24041bec"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/fields",
-			"Rev": "eb8c8024849baa3681995b2b0bd4da7ea1734ace"
+			"Rev": "f1a02064268befe9cb07b02128ff1b6c24041bec"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/labels",
-			"Rev": "eb8c8024849baa3681995b2b0bd4da7ea1734ace"
+			"Rev": "f1a02064268befe9cb07b02128ff1b6c24041bec"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/runtime",
-			"Rev": "eb8c8024849baa3681995b2b0bd4da7ea1734ace"
+			"Rev": "f1a02064268befe9cb07b02128ff1b6c24041bec"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/runtime/schema",
-			"Rev": "eb8c8024849baa3681995b2b0bd4da7ea1734ace"
+			"Rev": "f1a02064268befe9cb07b02128ff1b6c24041bec"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer",
-			"Rev": "eb8c8024849baa3681995b2b0bd4da7ea1734ace"
+			"Rev": "f1a02064268befe9cb07b02128ff1b6c24041bec"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer/json",
-			"Rev": "eb8c8024849baa3681995b2b0bd4da7ea1734ace"
+			"Rev": "f1a02064268befe9cb07b02128ff1b6c24041bec"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer/protobuf",
-			"Rev": "eb8c8024849baa3681995b2b0bd4da7ea1734ace"
+			"Rev": "f1a02064268befe9cb07b02128ff1b6c24041bec"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer/recognizer",
-			"Rev": "eb8c8024849baa3681995b2b0bd4da7ea1734ace"
+			"Rev": "f1a02064268befe9cb07b02128ff1b6c24041bec"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer/streaming",
-			"Rev": "eb8c8024849baa3681995b2b0bd4da7ea1734ace"
+			"Rev": "f1a02064268befe9cb07b02128ff1b6c24041bec"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer/versioning",
-			"Rev": "eb8c8024849baa3681995b2b0bd4da7ea1734ace"
+			"Rev": "f1a02064268befe9cb07b02128ff1b6c24041bec"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/selection",
-			"Rev": "eb8c8024849baa3681995b2b0bd4da7ea1734ace"
+			"Rev": "f1a02064268befe9cb07b02128ff1b6c24041bec"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/types",
-			"Rev": "eb8c8024849baa3681995b2b0bd4da7ea1734ace"
+			"Rev": "f1a02064268befe9cb07b02128ff1b6c24041bec"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/cache",
-			"Rev": "eb8c8024849baa3681995b2b0bd4da7ea1734ace"
+			"Rev": "f1a02064268befe9cb07b02128ff1b6c24041bec"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/clock",
-			"Rev": "eb8c8024849baa3681995b2b0bd4da7ea1734ace"
+			"Rev": "f1a02064268befe9cb07b02128ff1b6c24041bec"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/diff",
-			"Rev": "eb8c8024849baa3681995b2b0bd4da7ea1734ace"
+			"Rev": "f1a02064268befe9cb07b02128ff1b6c24041bec"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/errors",
-			"Rev": "eb8c8024849baa3681995b2b0bd4da7ea1734ace"
+			"Rev": "f1a02064268befe9cb07b02128ff1b6c24041bec"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/framer",
-			"Rev": "eb8c8024849baa3681995b2b0bd4da7ea1734ace"
+			"Rev": "f1a02064268befe9cb07b02128ff1b6c24041bec"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/httpstream",
-			"Rev": "eb8c8024849baa3681995b2b0bd4da7ea1734ace"
+			"Rev": "f1a02064268befe9cb07b02128ff1b6c24041bec"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/httpstream/spdy",
-			"Rev": "eb8c8024849baa3681995b2b0bd4da7ea1734ace"
+			"Rev": "f1a02064268befe9cb07b02128ff1b6c24041bec"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/intstr",
-			"Rev": "eb8c8024849baa3681995b2b0bd4da7ea1734ace"
+			"Rev": "f1a02064268befe9cb07b02128ff1b6c24041bec"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/json",
-			"Rev": "eb8c8024849baa3681995b2b0bd4da7ea1734ace"
+			"Rev": "f1a02064268befe9cb07b02128ff1b6c24041bec"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/mergepatch",
-			"Rev": "eb8c8024849baa3681995b2b0bd4da7ea1734ace"
+			"Rev": "f1a02064268befe9cb07b02128ff1b6c24041bec"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/naming",
-			"Rev": "eb8c8024849baa3681995b2b0bd4da7ea1734ace"
+			"Rev": "f1a02064268befe9cb07b02128ff1b6c24041bec"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/net",
-			"Rev": "eb8c8024849baa3681995b2b0bd4da7ea1734ace"
+			"Rev": "f1a02064268befe9cb07b02128ff1b6c24041bec"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/remotecommand",
-			"Rev": "eb8c8024849baa3681995b2b0bd4da7ea1734ace"
+			"Rev": "f1a02064268befe9cb07b02128ff1b6c24041bec"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/runtime",
-			"Rev": "eb8c8024849baa3681995b2b0bd4da7ea1734ace"
+			"Rev": "f1a02064268befe9cb07b02128ff1b6c24041bec"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/sets",
-			"Rev": "eb8c8024849baa3681995b2b0bd4da7ea1734ace"
+			"Rev": "f1a02064268befe9cb07b02128ff1b6c24041bec"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/strategicpatch",
-			"Rev": "eb8c8024849baa3681995b2b0bd4da7ea1734ace"
+			"Rev": "f1a02064268befe9cb07b02128ff1b6c24041bec"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/validation",
-			"Rev": "eb8c8024849baa3681995b2b0bd4da7ea1734ace"
+			"Rev": "f1a02064268befe9cb07b02128ff1b6c24041bec"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/validation/field",
-			"Rev": "eb8c8024849baa3681995b2b0bd4da7ea1734ace"
+			"Rev": "f1a02064268befe9cb07b02128ff1b6c24041bec"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/wait",
-			"Rev": "eb8c8024849baa3681995b2b0bd4da7ea1734ace"
+			"Rev": "f1a02064268befe9cb07b02128ff1b6c24041bec"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/yaml",
-			"Rev": "eb8c8024849baa3681995b2b0bd4da7ea1734ace"
+			"Rev": "f1a02064268befe9cb07b02128ff1b6c24041bec"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/version",
-			"Rev": "eb8c8024849baa3681995b2b0bd4da7ea1734ace"
+			"Rev": "f1a02064268befe9cb07b02128ff1b6c24041bec"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/watch",
-			"Rev": "eb8c8024849baa3681995b2b0bd4da7ea1734ace"
+			"Rev": "f1a02064268befe9cb07b02128ff1b6c24041bec"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/third_party/forked/golang/json",
-			"Rev": "eb8c8024849baa3681995b2b0bd4da7ea1734ace"
+			"Rev": "f1a02064268befe9cb07b02128ff1b6c24041bec"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/third_party/forked/golang/netutil",
-			"Rev": "eb8c8024849baa3681995b2b0bd4da7ea1734ace"
+			"Rev": "f1a02064268befe9cb07b02128ff1b6c24041bec"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/third_party/forked/golang/reflect",
-			"Rev": "eb8c8024849baa3681995b2b0bd4da7ea1734ace"
+			"Rev": "f1a02064268befe9cb07b02128ff1b6c24041bec"
 		},
 		{
 			"ImportPath": "k8s.io/klog",
diff --git a/util/workqueue/default_rate_limiters.go b/util/workqueue/default_rate_limiters.go
index a5bed29e..95c52db8 100644
--- a/util/workqueue/default_rate_limiters.go
+++ b/util/workqueue/default_rate_limiters.go
@@ -35,7 +35,7 @@ type RateLimiter interface {
 }
 
 // DefaultControllerRateLimiter is a no-arg constructor for a default rate limiter for a workqueue.  It has
-// both overall and per-item rate limitting.  The overall is a token bucket and the per-item is exponential
+// both overall and per-item rate limiting.  The overall is a token bucket and the per-item is exponential
 func DefaultControllerRateLimiter() RateLimiter {
 	return NewMaxOfRateLimiter(
 		NewItemExponentialFailureRateLimiter(5*time.Millisecond, 1000*time.Second),
diff --git a/util/workqueue/rate_limitting_queue.go b/util/workqueue/rate_limiting_queue.go
similarity index 100%
rename from util/workqueue/rate_limitting_queue.go
rename to util/workqueue/rate_limiting_queue.go
diff --git a/util/workqueue/rate_limitting_queue_test.go b/util/workqueue/rate_limiting_queue_test.go
similarity index 100%
rename from util/workqueue/rate_limitting_queue_test.go
rename to util/workqueue/rate_limiting_queue_test.go