MRG fix broken scorer, add non-regression test.

Closes #1831.
At least the bug part.

I still think if a specific scoring is given, this should take precedence over the ``score`` method of the base estimator. The problem is that this change would not be backward compatible :-/
One might consider the current behavior a bug, though.