Merge branch 'weka' of https://github.com/shilad/context-sensitive-sr into weka

Conflicts:
	algorithms/src/org/macademia/algs/Kmeans.java
Merge branch 'weka' of https://github.com/shilad/context-sensitive-sr into weka

Conflicts:
	algorithms/src/org/macademia/algs/Kmeans.java