mod_lock
fix(mod): redirect dashboard to /dashboard
Merge pull request #324 from philips/redirect-mod-dashboard-trailing-slash

fix(mod): redirect dashboard to /dashboard
fix(etcd): remove duplicate DataDir setup

In the refactor of the configuration and flags I think that we
accidently placed this logic twice. The side effect is that we always
ended up with a `.etcd` directory.
Merge pull request #329 from philips/remove-redundant-datadir-code

fix(etcd): remove duplicate DataDir setup
feat(README): add clojure client rthomas/clj-etcd
fix(etcd): fixup the name and data dir guessing

- Only generate the name from a hostname if the data dir is not
  specified and the name is not specified

- Only guess the data dir from Name if the data dir wasn't already
  specified
Merge pull request #340 from philips/add-rthomas-clj-etcd

feat(README): add clojure client rthomas/clj-etcd
mod/lock
Merge branch 'master' of https://github.com/coreos/etcd into mod-lock

Conflicts:
	mod/mod.go
Merge pull request #341 from philips/fixup-name-and-data-dir-guessing

fix(etcd): fixup the name and data dir guessing
fix(README): link to etcdctl directly

link to the etcdctl homepage directly
fix(README): use machine instead of node

Internally we call every member of an etcd cluster a "machine" so stay
consistent when talking in the README.
Initial mod_lock acquire.
refactor(Node) do not expose node struct
refactor event
refactor change node_repr to node_extern
Lock testing.
Merge branch 'master' of https://github.com/coreos/etcd into mod-lock
Merge pull request #342 from philips/use-machine-nomenclature

fix(README): use machine instead of node