diff --git a/Godeps/Godeps.json b/Godeps/Godeps.json
index 5e593577..fbdb406e 100644
--- a/Godeps/Godeps.json
+++ b/Godeps/Godeps.json
@@ -244,331 +244,331 @@
 		},
 		{
 			"ImportPath": "k8s.io/api/admissionregistration/v1alpha1",
-			"Rev": "6ef9db38b7d4d02a221e7af3e7f508ff19706fc6"
+			"Rev": "99b35971cc9d07896d4428dc09ad3efacef8b21f"
 		},
 		{
 			"ImportPath": "k8s.io/api/admissionregistration/v1beta1",
-			"Rev": "6ef9db38b7d4d02a221e7af3e7f508ff19706fc6"
+			"Rev": "99b35971cc9d07896d4428dc09ad3efacef8b21f"
 		},
 		{
 			"ImportPath": "k8s.io/api/apps/v1",
-			"Rev": "6ef9db38b7d4d02a221e7af3e7f508ff19706fc6"
+			"Rev": "99b35971cc9d07896d4428dc09ad3efacef8b21f"
 		},
 		{
 			"ImportPath": "k8s.io/api/apps/v1beta1",
-			"Rev": "6ef9db38b7d4d02a221e7af3e7f508ff19706fc6"
+			"Rev": "99b35971cc9d07896d4428dc09ad3efacef8b21f"
 		},
 		{
 			"ImportPath": "k8s.io/api/apps/v1beta2",
-			"Rev": "6ef9db38b7d4d02a221e7af3e7f508ff19706fc6"
+			"Rev": "99b35971cc9d07896d4428dc09ad3efacef8b21f"
 		},
 		{
 			"ImportPath": "k8s.io/api/authentication/v1",
-			"Rev": "6ef9db38b7d4d02a221e7af3e7f508ff19706fc6"
+			"Rev": "99b35971cc9d07896d4428dc09ad3efacef8b21f"
 		},
 		{
 			"ImportPath": "k8s.io/api/authentication/v1beta1",
-			"Rev": "6ef9db38b7d4d02a221e7af3e7f508ff19706fc6"
+			"Rev": "99b35971cc9d07896d4428dc09ad3efacef8b21f"
 		},
 		{
 			"ImportPath": "k8s.io/api/authorization/v1",
-			"Rev": "6ef9db38b7d4d02a221e7af3e7f508ff19706fc6"
+			"Rev": "99b35971cc9d07896d4428dc09ad3efacef8b21f"
 		},
 		{
 			"ImportPath": "k8s.io/api/authorization/v1beta1",
-			"Rev": "6ef9db38b7d4d02a221e7af3e7f508ff19706fc6"
+			"Rev": "99b35971cc9d07896d4428dc09ad3efacef8b21f"
 		},
 		{
 			"ImportPath": "k8s.io/api/autoscaling/v1",
-			"Rev": "6ef9db38b7d4d02a221e7af3e7f508ff19706fc6"
+			"Rev": "99b35971cc9d07896d4428dc09ad3efacef8b21f"
 		},
 		{
 			"ImportPath": "k8s.io/api/autoscaling/v2beta1",
-			"Rev": "6ef9db38b7d4d02a221e7af3e7f508ff19706fc6"
+			"Rev": "99b35971cc9d07896d4428dc09ad3efacef8b21f"
 		},
 		{
 			"ImportPath": "k8s.io/api/batch/v1",
-			"Rev": "6ef9db38b7d4d02a221e7af3e7f508ff19706fc6"
+			"Rev": "99b35971cc9d07896d4428dc09ad3efacef8b21f"
 		},
 		{
 			"ImportPath": "k8s.io/api/batch/v1beta1",
-			"Rev": "6ef9db38b7d4d02a221e7af3e7f508ff19706fc6"
+			"Rev": "99b35971cc9d07896d4428dc09ad3efacef8b21f"
 		},
 		{
 			"ImportPath": "k8s.io/api/batch/v2alpha1",
-			"Rev": "6ef9db38b7d4d02a221e7af3e7f508ff19706fc6"
+			"Rev": "99b35971cc9d07896d4428dc09ad3efacef8b21f"
 		},
 		{
 			"ImportPath": "k8s.io/api/certificates/v1beta1",
-			"Rev": "6ef9db38b7d4d02a221e7af3e7f508ff19706fc6"
+			"Rev": "99b35971cc9d07896d4428dc09ad3efacef8b21f"
 		},
 		{
 			"ImportPath": "k8s.io/api/core/v1",
-			"Rev": "6ef9db38b7d4d02a221e7af3e7f508ff19706fc6"
+			"Rev": "99b35971cc9d07896d4428dc09ad3efacef8b21f"
 		},
 		{
 			"ImportPath": "k8s.io/api/events/v1beta1",
-			"Rev": "6ef9db38b7d4d02a221e7af3e7f508ff19706fc6"
+			"Rev": "99b35971cc9d07896d4428dc09ad3efacef8b21f"
 		},
 		{
 			"ImportPath": "k8s.io/api/extensions/v1beta1",
-			"Rev": "6ef9db38b7d4d02a221e7af3e7f508ff19706fc6"
+			"Rev": "99b35971cc9d07896d4428dc09ad3efacef8b21f"
 		},
 		{
 			"ImportPath": "k8s.io/api/imagepolicy/v1alpha1",
-			"Rev": "6ef9db38b7d4d02a221e7af3e7f508ff19706fc6"
+			"Rev": "99b35971cc9d07896d4428dc09ad3efacef8b21f"
 		},
 		{
 			"ImportPath": "k8s.io/api/networking/v1",
-			"Rev": "6ef9db38b7d4d02a221e7af3e7f508ff19706fc6"
+			"Rev": "99b35971cc9d07896d4428dc09ad3efacef8b21f"
 		},
 		{
 			"ImportPath": "k8s.io/api/policy/v1beta1",
-			"Rev": "6ef9db38b7d4d02a221e7af3e7f508ff19706fc6"
+			"Rev": "99b35971cc9d07896d4428dc09ad3efacef8b21f"
 		},
 		{
 			"ImportPath": "k8s.io/api/rbac/v1",
-			"Rev": "6ef9db38b7d4d02a221e7af3e7f508ff19706fc6"
+			"Rev": "99b35971cc9d07896d4428dc09ad3efacef8b21f"
 		},
 		{
 			"ImportPath": "k8s.io/api/rbac/v1alpha1",
-			"Rev": "6ef9db38b7d4d02a221e7af3e7f508ff19706fc6"
+			"Rev": "99b35971cc9d07896d4428dc09ad3efacef8b21f"
 		},
 		{
 			"ImportPath": "k8s.io/api/rbac/v1beta1",
-			"Rev": "6ef9db38b7d4d02a221e7af3e7f508ff19706fc6"
+			"Rev": "99b35971cc9d07896d4428dc09ad3efacef8b21f"
 		},
 		{
 			"ImportPath": "k8s.io/api/scheduling/v1alpha1",
-			"Rev": "6ef9db38b7d4d02a221e7af3e7f508ff19706fc6"
+			"Rev": "99b35971cc9d07896d4428dc09ad3efacef8b21f"
 		},
 		{
 			"ImportPath": "k8s.io/api/settings/v1alpha1",
-			"Rev": "6ef9db38b7d4d02a221e7af3e7f508ff19706fc6"
+			"Rev": "99b35971cc9d07896d4428dc09ad3efacef8b21f"
 		},
 		{
 			"ImportPath": "k8s.io/api/storage/v1",
-			"Rev": "6ef9db38b7d4d02a221e7af3e7f508ff19706fc6"
+			"Rev": "99b35971cc9d07896d4428dc09ad3efacef8b21f"
 		},
 		{
 			"ImportPath": "k8s.io/api/storage/v1alpha1",
-			"Rev": "6ef9db38b7d4d02a221e7af3e7f508ff19706fc6"
+			"Rev": "99b35971cc9d07896d4428dc09ad3efacef8b21f"
 		},
 		{
 			"ImportPath": "k8s.io/api/storage/v1beta1",
-			"Rev": "6ef9db38b7d4d02a221e7af3e7f508ff19706fc6"
+			"Rev": "99b35971cc9d07896d4428dc09ad3efacef8b21f"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/api/equality",
-			"Rev": "2ab20e7c92cbf77b2f9fab331a650fa7831f7856"
+			"Rev": "d4f16a2aed4597fc1943728242c28b80ce18d753"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/api/errors",
-			"Rev": "2ab20e7c92cbf77b2f9fab331a650fa7831f7856"
+			"Rev": "d4f16a2aed4597fc1943728242c28b80ce18d753"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/api/meta",
-			"Rev": "2ab20e7c92cbf77b2f9fab331a650fa7831f7856"
+			"Rev": "d4f16a2aed4597fc1943728242c28b80ce18d753"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/api/resource",
-			"Rev": "2ab20e7c92cbf77b2f9fab331a650fa7831f7856"
+			"Rev": "d4f16a2aed4597fc1943728242c28b80ce18d753"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/api/testing",
-			"Rev": "2ab20e7c92cbf77b2f9fab331a650fa7831f7856"
+			"Rev": "d4f16a2aed4597fc1943728242c28b80ce18d753"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/api/testing/fuzzer",
-			"Rev": "2ab20e7c92cbf77b2f9fab331a650fa7831f7856"
+			"Rev": "d4f16a2aed4597fc1943728242c28b80ce18d753"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/api/testing/roundtrip",
-			"Rev": "2ab20e7c92cbf77b2f9fab331a650fa7831f7856"
+			"Rev": "d4f16a2aed4597fc1943728242c28b80ce18d753"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/apimachinery",
-			"Rev": "2ab20e7c92cbf77b2f9fab331a650fa7831f7856"
+			"Rev": "d4f16a2aed4597fc1943728242c28b80ce18d753"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/apimachinery/announced",
-			"Rev": "2ab20e7c92cbf77b2f9fab331a650fa7831f7856"
+			"Rev": "d4f16a2aed4597fc1943728242c28b80ce18d753"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/apimachinery/registered",
-			"Rev": "2ab20e7c92cbf77b2f9fab331a650fa7831f7856"
+			"Rev": "d4f16a2aed4597fc1943728242c28b80ce18d753"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/apis/meta/fuzzer",
-			"Rev": "2ab20e7c92cbf77b2f9fab331a650fa7831f7856"
+			"Rev": "d4f16a2aed4597fc1943728242c28b80ce18d753"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/apis/meta/internalversion",
-			"Rev": "2ab20e7c92cbf77b2f9fab331a650fa7831f7856"
+			"Rev": "d4f16a2aed4597fc1943728242c28b80ce18d753"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/apis/meta/v1",
-			"Rev": "2ab20e7c92cbf77b2f9fab331a650fa7831f7856"
+			"Rev": "d4f16a2aed4597fc1943728242c28b80ce18d753"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured",
-			"Rev": "2ab20e7c92cbf77b2f9fab331a650fa7831f7856"
+			"Rev": "d4f16a2aed4597fc1943728242c28b80ce18d753"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/apis/meta/v1beta1",
-			"Rev": "2ab20e7c92cbf77b2f9fab331a650fa7831f7856"
+			"Rev": "d4f16a2aed4597fc1943728242c28b80ce18d753"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/conversion",
-			"Rev": "2ab20e7c92cbf77b2f9fab331a650fa7831f7856"
+			"Rev": "d4f16a2aed4597fc1943728242c28b80ce18d753"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/conversion/queryparams",
-			"Rev": "2ab20e7c92cbf77b2f9fab331a650fa7831f7856"
+			"Rev": "d4f16a2aed4597fc1943728242c28b80ce18d753"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/fields",
-			"Rev": "2ab20e7c92cbf77b2f9fab331a650fa7831f7856"
+			"Rev": "d4f16a2aed4597fc1943728242c28b80ce18d753"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/labels",
-			"Rev": "2ab20e7c92cbf77b2f9fab331a650fa7831f7856"
+			"Rev": "d4f16a2aed4597fc1943728242c28b80ce18d753"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/runtime",
-			"Rev": "2ab20e7c92cbf77b2f9fab331a650fa7831f7856"
+			"Rev": "d4f16a2aed4597fc1943728242c28b80ce18d753"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/runtime/schema",
-			"Rev": "2ab20e7c92cbf77b2f9fab331a650fa7831f7856"
+			"Rev": "d4f16a2aed4597fc1943728242c28b80ce18d753"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer",
-			"Rev": "2ab20e7c92cbf77b2f9fab331a650fa7831f7856"
+			"Rev": "d4f16a2aed4597fc1943728242c28b80ce18d753"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer/json",
-			"Rev": "2ab20e7c92cbf77b2f9fab331a650fa7831f7856"
+			"Rev": "d4f16a2aed4597fc1943728242c28b80ce18d753"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer/protobuf",
-			"Rev": "2ab20e7c92cbf77b2f9fab331a650fa7831f7856"
+			"Rev": "d4f16a2aed4597fc1943728242c28b80ce18d753"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer/recognizer",
-			"Rev": "2ab20e7c92cbf77b2f9fab331a650fa7831f7856"
+			"Rev": "d4f16a2aed4597fc1943728242c28b80ce18d753"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer/streaming",
-			"Rev": "2ab20e7c92cbf77b2f9fab331a650fa7831f7856"
+			"Rev": "d4f16a2aed4597fc1943728242c28b80ce18d753"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer/versioning",
-			"Rev": "2ab20e7c92cbf77b2f9fab331a650fa7831f7856"
+			"Rev": "d4f16a2aed4597fc1943728242c28b80ce18d753"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/selection",
-			"Rev": "2ab20e7c92cbf77b2f9fab331a650fa7831f7856"
+			"Rev": "d4f16a2aed4597fc1943728242c28b80ce18d753"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/types",
-			"Rev": "2ab20e7c92cbf77b2f9fab331a650fa7831f7856"
+			"Rev": "d4f16a2aed4597fc1943728242c28b80ce18d753"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/cache",
-			"Rev": "2ab20e7c92cbf77b2f9fab331a650fa7831f7856"
+			"Rev": "d4f16a2aed4597fc1943728242c28b80ce18d753"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/clock",
-			"Rev": "2ab20e7c92cbf77b2f9fab331a650fa7831f7856"
+			"Rev": "d4f16a2aed4597fc1943728242c28b80ce18d753"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/diff",
-			"Rev": "2ab20e7c92cbf77b2f9fab331a650fa7831f7856"
+			"Rev": "d4f16a2aed4597fc1943728242c28b80ce18d753"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/errors",
-			"Rev": "2ab20e7c92cbf77b2f9fab331a650fa7831f7856"
+			"Rev": "d4f16a2aed4597fc1943728242c28b80ce18d753"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/framer",
-			"Rev": "2ab20e7c92cbf77b2f9fab331a650fa7831f7856"
+			"Rev": "d4f16a2aed4597fc1943728242c28b80ce18d753"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/httpstream",
-			"Rev": "2ab20e7c92cbf77b2f9fab331a650fa7831f7856"
+			"Rev": "d4f16a2aed4597fc1943728242c28b80ce18d753"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/httpstream/spdy",
-			"Rev": "2ab20e7c92cbf77b2f9fab331a650fa7831f7856"
+			"Rev": "d4f16a2aed4597fc1943728242c28b80ce18d753"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/intstr",
-			"Rev": "2ab20e7c92cbf77b2f9fab331a650fa7831f7856"
+			"Rev": "d4f16a2aed4597fc1943728242c28b80ce18d753"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/json",
-			"Rev": "2ab20e7c92cbf77b2f9fab331a650fa7831f7856"
+			"Rev": "d4f16a2aed4597fc1943728242c28b80ce18d753"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/mergepatch",
-			"Rev": "2ab20e7c92cbf77b2f9fab331a650fa7831f7856"
+			"Rev": "d4f16a2aed4597fc1943728242c28b80ce18d753"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/net",
-			"Rev": "2ab20e7c92cbf77b2f9fab331a650fa7831f7856"
+			"Rev": "d4f16a2aed4597fc1943728242c28b80ce18d753"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/remotecommand",
-			"Rev": "2ab20e7c92cbf77b2f9fab331a650fa7831f7856"
+			"Rev": "d4f16a2aed4597fc1943728242c28b80ce18d753"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/runtime",
-			"Rev": "2ab20e7c92cbf77b2f9fab331a650fa7831f7856"
+			"Rev": "d4f16a2aed4597fc1943728242c28b80ce18d753"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/sets",
-			"Rev": "2ab20e7c92cbf77b2f9fab331a650fa7831f7856"
+			"Rev": "d4f16a2aed4597fc1943728242c28b80ce18d753"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/strategicpatch",
-			"Rev": "2ab20e7c92cbf77b2f9fab331a650fa7831f7856"
+			"Rev": "d4f16a2aed4597fc1943728242c28b80ce18d753"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/validation",
-			"Rev": "2ab20e7c92cbf77b2f9fab331a650fa7831f7856"
+			"Rev": "d4f16a2aed4597fc1943728242c28b80ce18d753"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/validation/field",
-			"Rev": "2ab20e7c92cbf77b2f9fab331a650fa7831f7856"
+			"Rev": "d4f16a2aed4597fc1943728242c28b80ce18d753"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/wait",
-			"Rev": "2ab20e7c92cbf77b2f9fab331a650fa7831f7856"
+			"Rev": "d4f16a2aed4597fc1943728242c28b80ce18d753"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/yaml",
-			"Rev": "2ab20e7c92cbf77b2f9fab331a650fa7831f7856"
+			"Rev": "d4f16a2aed4597fc1943728242c28b80ce18d753"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/version",
-			"Rev": "2ab20e7c92cbf77b2f9fab331a650fa7831f7856"
+			"Rev": "d4f16a2aed4597fc1943728242c28b80ce18d753"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/watch",
-			"Rev": "2ab20e7c92cbf77b2f9fab331a650fa7831f7856"
+			"Rev": "d4f16a2aed4597fc1943728242c28b80ce18d753"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/third_party/forked/golang/json",
-			"Rev": "2ab20e7c92cbf77b2f9fab331a650fa7831f7856"
+			"Rev": "d4f16a2aed4597fc1943728242c28b80ce18d753"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/third_party/forked/golang/netutil",
-			"Rev": "2ab20e7c92cbf77b2f9fab331a650fa7831f7856"
+			"Rev": "d4f16a2aed4597fc1943728242c28b80ce18d753"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/third_party/forked/golang/reflect",
-			"Rev": "2ab20e7c92cbf77b2f9fab331a650fa7831f7856"
+			"Rev": "d4f16a2aed4597fc1943728242c28b80ce18d753"
 		},
 		{
 			"ImportPath": "k8s.io/kube-openapi/pkg/util/proto",
diff --git a/pkg/apis/clientauthentication/install/install.go b/pkg/apis/clientauthentication/install/install.go
index 40093e97..f1b5ddeb 100644
--- a/pkg/apis/clientauthentication/install/install.go
+++ b/pkg/apis/clientauthentication/install/install.go
@@ -27,7 +27,7 @@ import (
 )
 
 // Install registers the API group and adds types to a scheme
-func Install(groupFactoryRegistry announced.APIGroupFactoryRegistry, registry *registered.APIRegistrationManager, scheme *runtime.Scheme) {
+func Install(registry *registered.APIRegistrationManager, scheme *runtime.Scheme) {
 	if err := announced.NewGroupMetaFactory(
 		&announced.GroupMetaFactoryArgs{
 			GroupName:                  clientauthentication.GroupName,
@@ -37,7 +37,7 @@ func Install(groupFactoryRegistry announced.APIGroupFactoryRegistry, registry *r
 		announced.VersionToSchemeFunc{
 			v1alpha1.SchemeGroupVersion.Version: v1alpha1.AddToScheme,
 		},
-	).Announce(groupFactoryRegistry).RegisterAndEnable(registry, scheme); err != nil {
+	).Register(registry, scheme); err != nil {
 		panic(err)
 	}
 }