BUGFIX: subtle misassociation of labels when using sklearn clustering. Now tracks original order of points throughout clustering.