Merge pull request #2 from satra/julia-mp2rage

a quick conflict resolution

Author: juhuntenburg

nipype/interfaces/fsl/ICA_AROMA.py

@@ -13,7 +13,7 @@
 
 from __future__ import print_function, division, unicode_literals, absolute_import
 from ..base import (TraitedSpec, CommandLineInputSpec, CommandLine,
-                    File, Directory, traits)
+                    File, Directory, traits, isdefined)
 import os
 
 
@@ -119,5 +119,3 @@ def _list_outputs(self):
     def _gen_filename(self, name):
         if name == 'out_dir':
             return os.getcwd()
-
-