Merge pull request #340 from effigies/nifti_test_bug

MRG: Nifti test bug; STY: PEP8 test_nifti1

PEP8 refactoring; restoring a couple of tests accidentally chopped.  Improving one test.

Author: matthew-brett