etcd v0.3.0 with cluster discovery
Clean code (trailing spaces / long lines)