Add categorical_features option to OneHotEncoder.
Support both masks and arrays of indices.
Typo.
Rename _apply_transform to _transform_selected and make it a function
rather than a method.
Merge branch 'master' of github.com:scikit-learn/scikit-learn into select_categorical
Address @jnothman's comments.
Change 'charse_error' to 'charset_error' in load_files.

'charset_error' is the name used in the documentation; I changed the
function to match it. It checks and deprecates the old name.
Revise documentation about handling text and bytes.
Add a documentation section about decoding text.

This is a stage that has to happen before extracting features. Adding
this documentation helps address a bug report about UnicodeDecodeErrors.
Move the new "Decoding text files" doc section

It should come after the other section that describes text feature
extraction.
DOC fix in the hierarchical clustering
Merge pull request #2118 from NelleV/DOC_fix

DOC fix in the hierarchical clustering
DOC Acknowledge sponsors for the Paris sprint
DOC missing stuff in randomized_l1 module

Fixes #2092.
PY3 xrange, np.divide, string.uppsercase, None comparison

Fixes #2108.
MAINT dedup Clay Woolam's contribs (>100 commits!)
FIX/ENH mean shift clustering

* min_bin_freq argument (fixes #2060, but needs a test)
* authors in comment, not docstring
* don't store fitted attributes (trailing _) before fit
DOC typo
ENH micro-optimize RFECV

Skip repeated indexing into X and y.
FIX mbkmeans benchmark bug (k instead of n_clusters)