Manual merge of s3_datasink and resource_multiproc branch for cpac run

Author: pintohutch

nipype/interfaces/base.py

@@ -1233,7 +1233,7 @@ def run_command(runtime, output=None, timeout=0.01, redirect_x=False):
     try:
         from memory_profiler import _get_memory
         import psutil
-        mem_proc = True
+        mem_prof = True
     except:
         mem_prof = False