bug fix and deprectation warning added to cross-validation
Merge branch 'master' of https://github.com/scikit-learn/scikit-learn into bootstrap
Merge pull request #3295 from rphlypo/bootstrap_traintest

[MRG+1] exception in bootstrap must be evoked when n_train + n_test > n (resolves issue #3290)