Regression

this PR is in reference to https://github.com/mne-tools/mne-python/pull/1034. It is addressing the API and style comments mentioned in that pull request. It is ready for review. 
ok, will do. I added sklearn in reference to https://github.com/mne-tools/mne-python/pull/1034#issuecomment-36734433.