SPM12 outputs .nii instead of .img/.hdr
change location of templates and gaussian parameters for SPM12 segment
revert MCR related change
Merge pull request #945 from chrisfilo/fix/spm12

Fix/spm12