Merge branch 'master' into nitime

* master: (31 commits)
  doc: updated debug config message.
  ants code cleanup (PEP8, unused variables)
  removed in_file from DTLUTGen docstring
  added changelog message
  removed unused variables
  removed unused imports
  pep8 and reindent
  removed an evil trailing comma from WIMT
  fix: added test to check that inputs are not modified when setting display variable via config
  fix: added tests, actually added display variable to config
  fix: interface environment always overwrites config environ DISPLAY
  doc: change closes nipy#368
  fix: environment inputs not changed by config display variable
  AFNITraitedSpec for Calc
  this is the nth time that I change this...
  test/fixs
  fixing what I messed up
  fixing abspath
  multiple files for tcat and merge
  default suffix more appropriated
  ...

Author: bpinsard

CHANGES

@@ -1,7 +1,10 @@
 Since last release
 ==================
 
-* ENH: New interfaces: MySQLSink, nipy.Similarity, WatershedBEM
+* API: display variable no longer encoded as inputs in commandline interfaces
+
+* ENH: New interfaces: MySQLSink, nipy.Similarity, WatershedBEM,
+       NetworkBasedStatistic
 
 * FIX: Afni outputs should inherit from TraitedSpec
 

doc/users/debug.rst

@@ -17,11 +17,16 @@ performance issues.
 
 #. Use the debug config mode. This can be done by setting::
 
-      import config
+      from nipype import config
       config.enable_debug_mode()
 
    as the first import of your nipype script.
 
+   .. note::
+
+     Turning on debug will rerun your workflows and will rerun them after debugging
+     is turned off.
+
 #. There are several configuration options that can help with debugging. See
    :ref:`config_file` for more details::