Simplify listener
Match changes to the etcd client API
Merge pull request #7 from flynn/update-etcd-client

Update etcd client