temp pre merge
Merge branch 'master' of github.com:jonahkall/JBParallel
kmeans working, will parellelize and generalize sort soon
oops, fixed