[MRG] remove deprecated stuff from 0.17#4370

ogrisel merged 2 commits intoscikit-learn:masterscikit-learn/scikit-learn:masterfrom

amueller:0.17_deprecatedamueller/scikit-learn:0.17_deprecatedCopy head branch name to clipboard