Fix duplicates in registry.
Merge branch 'refactoring' of https://github.com/benbjohnson/etcd into refactoring

Conflicts:
	server/registry.go