maybe working. not sure yet
i think i have it!
Merge branch 'knn2'
Merge pull request #76 from julbright/master

i think this should do it