Use the vendored version of etcd
Merge pull request #47 from smarterclayton/update_to_new_stable

Update Kubernetes to latest stable_proposed
Integrate builds in openshift origin