migrated to etcd, having much more success
merging etcd feature into develop branch