Update to etcd 0.4.6
Use etcd discovery