MISC: build_utils: module rather than a subpackages
ENH: use sklearn.__version__ in setup.py
Merge branch 'linking_arrayfuncs'

Conflicts:
	setup.py
	sklearn/__init__.py
Merge branch 'master' of github.com:scikit-learn/scikit-learn
missing pl.show() in plot_digits_agglomeration.py
TST upgrade trivial (single-class) k-NN problems to binary ones

XXX should we raise a warning/exception when there is only one class in y?
Cosmit: comment

as requested by @ogrisel
TST: fix doctest
Update whats_new
Clean: remove debug print
PEP8
Typos
Merge pull request #983 from GaelVaroquaux/faster_ward

MRG: Faster ward
DOC + TST vocabulary arg in CountVect docstring

Somewhere during the last refactoring, the documentation for the argument
went missing.
Also, check for Mapping subclass instead of hasattr "get" and test with a
few different types.
COSMIT move BaseSGD to its only place of usage
DOC: add tutorial links
Update doc/whats_new.rst

Typo.
Update doc/whats_new.rst

Credit authors.
MISC : update my web site URL in what's new
COSMIT minor refactoring of SGD