Added etcd.
Merge branch 'master' of github.com:sm/sm-servers