Restore k-NN bug fixes
Merge branch 'master' of https://github.com/tomshen/lsh-propagation

Conflicts:
	graph_gen.py