Support clustering with chef solo and a bunch of other improvements