Added KMeans. Also have some broken (but commented out) code in
PeakAnalysis that was intended to get rid of ugly code with new code.
Perhaps return to this if we have time.