Merge branch 'master' of github.com:dohmatob/nilearn
WIP
Merge branch 'master' of https://github.com/dohmatob/nilearn into sparse-models
Merge branch 'sparse-models' of is150118:~/CODE/FORKED/nilearn into sparse-models
WIP (only supporting niimgs for X and mask)