Switching over to etcd use.
Updating to handle etcd and Docker 1.3.x