Merge branch 'master' of https://github.com/benbjohnson/etcd into ben…

…bjohnson-master

Conflicts:
	README.md

Merge pull request etcd-io#130 from philips/add-version-to-join2

add versioning to cluster join

Merge pull request etcd-io#92 from philips/add-default-name

fix(etcd): add a default name