whoops; minor fix
Merge branch 'master' into clustering
few tweaks to kernel k-means (still dunno if it works, really)