Fix to predictHierClustering returning proper data prediction labels.

[hloneal]

Fix to not requiring data for the second time and actually return the proper cluster labels for data.

Fixed structure to match unsupervised learning.