Merge pull request #3396 from fabioboh/master

[FIX] small edits to my previous pull request (PR #3394) due to bugs revealed when running within my nipype workflow

nipype/interfaces/spm/preprocess.py

@@ -339,18 +339,17 @@ def _format_arg(self, opt, spec, val):
 
         if opt in ["in_files", "vdmfile"]:
             return scans_for_fname(ensure_list(val))
-        return super(FieldMap, self)._format_arg(opt, spec, val)
+        return super(ApplyVDM, self)._format_arg(opt, spec, val)
 
     def _parse_inputs(self):
         """validate spm fieldmap options if set to None ignore"""
 
         einputs = super(ApplyVDM, self)._parse_inputs()
 
-        return [{"applymap": einputs[0]}]
+        return [{"applyvdm": einputs[0]}]
 
     def _list_outputs(self):
         outputs = self._outputs().get()
-        jobtype = self.inputs.jobtype
         resliced_all = self.inputs.write_which[0] > 0
         resliced_mean = self.inputs.write_which[1] > 0
         if resliced_mean: