Merge pull request #2 from mceloud/etcd

Etcd