Committing some code that I think will merge really easily
Merge branch 'evaluation' of https://github.com/Drin/spam into evaluation

Conflicts:
	com/drin/python/similarity_generation/OHClustEvaluation.py