Merge remote-tracking branch 'upstream/clusterAlgorithms' into people

Conflicts:
	algorithms/src/org/macademia/algs/SimilarityMatrix.java
	algorithms/src/org/macademia/algs/Test.java