merge
config format changes, client updates
remove old builder dockerfile, move new ones into folder
docker build commands