Merge branch 'py3' of https://github.com/ogrisel/scikit-learn into py3
Merge branch 'py3' of https://github.com/ogrisel/scikit-learn into py3
PY3: used six.moves.xrange to fix xrange in module test_grid_search.py
PY3: used six.moves.xrange to fix xrange in module test_metrics.py
Merge branch 'py3' of https://github.com/raulgarreta/scikit-learn into py3