Temporarily disable ordering of clusters

Currently our ordering implementation yields significantly worse results
in the order phase due to the addition of support for clusters. We need
to go back and optimize the results, but that is for another day. For
now we stub out and comment out clustering related code as appropriate.
Prep v0.3.3 release