This includes the assimilation of clusterd that Leigh did awhile back
as well as a few bug fixes.