Reintroduced includ ein clustering_utils.hpp.
Made datum_range_t have private fields, the way it had been.