fixed conflicts
Merge pull request #26 from SEL-Columbia/dist_fix

Removed sklearn distance computations that were way off