knn, a word on confusion matrices
Merge branch 'master' into gh-pages
Bring up to date w/ master