fixed grammatical error + renaming of parameter in docstring
fixed grammatical error + renaming of parameter in docstring
Merge remote-tracking branch 'origin/develop' into develop
changed .gitignore to not track nilearn.egg-info/
docstring updatesfor high_variance_confounds
default values as per the ComCor paper (2 percent of voxels retained)
default to 5 high variance confounds as per the CompCorr paper
changed tests/test_signal.py according to default percentile changes (value lowered to 1., to contrast with default of 2.)
reverted n_datasets to n_subjects
Merge branch 'develop' of https://github.com/rphlypo/nilearn into rphlypo-develop

Conflicts:
	nilearn/group_sparse_covariance.py
Improve documentation
scoped numpy, scipy, sklearn imports, added import for input_data
Do not import submodules
Changed scoring for group_sparse_covariance as to render it independent from the scikit-learn version in which the log_likelihood function has been updated.
ENH: avoid resampling

if not necessary
Merge remote-tracking branch 'upstream/master' into tv_l1

* upstream/master:
  ENH: avoid resampling
  Changed scoring for group_sparse_covariance as to render it independent from the scikit-learn version in which the log_likelihood function has been updated.
  Do not import submodules
  scoped numpy, scipy, sklearn imports, added import for input_data
  Improve documentation
  reverted n_datasets to n_subjects
  changed tests/test_signal.py according to default percentile changes (value lowered to 1., to contrast with default of 2.)
  default to 5 high variance confounds as per the CompCorr paper
  default values as per the ComCor paper (2 percent of voxels retained)
  docstring updatesfor high_variance_confounds
  changed .gitignore to not track nilearn.egg-info/
  fixed grammatical error + renaming of parameter in docstring
  fixed grammatical error + renaming of parameter in docstring