BUG/COSMIT: fix searchlight with sklearn master

And simplify a bit code with the assumption that X is always masked