Just merging RUNs to decrease the number of layers

At this point, the implementation is completely working and has been
tested running live and federating with other instances.

No fancy script or minit automatic migration, etc, but if you start
the docker image and go in and manually do everything, it works.