Testing fixes
Merge branch 'greedy'
Reorganize, add Medoids to LOAD_PATH