Merge branch 'master' into sc

.mailmap

benchmarks/bench_neighbors.py

benchmarks/bench_plot_balltree.py

benchmarks/bench_plot_neighbors.py

doc/about.rst

doc/conf.py

doc/datasets/index.rst

doc/developers/performance.rst

doc/index.rst

doc/modules/classes.rst

doc/modules/clustering.rst

doc/modules/gaussian_process.rst

doc/modules/mixture.rst

doc/modules/multiclass.rst

doc/modules/naive_bayes.rst

doc/modules/neighbors.rst

doc/modules/svm.rst

doc/themes/scikit-learn/layout.html

doc/whats_new.rst

examples/cluster/plot_adjusted_for_chance_measures.py