Merge branch 'master' of https://github.com/coreos/etcd into clean-up-config

Conflicts:
	etcd.go