Cleaned up plotting code.  Now, clusters are explicit.  Added ROC and TP/FP plot.