Replace mask parameter of masker by mask_img.
Fix MultiPCA test
3D checking as already been done a few lines above through check_niimg with ensure_3d=True

Minor whitespace alignment
An attempt to rebase on top of master