Various fixes

Remove MemoryRegistry.
Add EtcdRegistry.
Various renames.