Update Kubernetes to 1218059
Removed service resource, updated client resource some

Removed the coupling between the OpenShift client and the Kube
client.  The two are separate.
Use the vendored version of etcd
Merge pull request #47 from smarterclayton/update_to_new_stable

Update Kubernetes to latest stable_proposed
Use consistent etcd name