More balanced view around parameters
Merge branch 'affinity_docs' of github.com:robertlayton/scikit-learn into affinity_docs

Conflicts:
	doc/modules/clustering.rst