add builder and registry placeholder, more cleanup
move etcd sets out of chef and into container