Changes to etcd to get setup and start to run.

Pretty simple changes I made to get etcd to run.

That said, etcd seems pretty rough right now. I got 2/5 joined and the other 3 fail to recognize the cluster, even though telnet/curl to both sockets works. Weird, but an unrelated issue to this afaik.