Merge branch 'master' into fix/RedirectX

Conflicts:
	CHANGES
	nipype/interfaces/base.py

Author: oesteban

CHANGES

@@ -2,6 +2,7 @@ Next release
 ============
 
 * FIX: Interfaces redirecting X crashed if $DISPLAY not defined (https://github.com/nipy/nipype/pull/1027)
+* FIX: Bug crashed 'make api' (https://github.com/nipy/nipype/pull/1026)
 * ENH: Updated antsIntroduction to handle RA and RI registrations (https://github.com/nipy/nipype/pull/1009)
 * ENH: Updated N4BiasCorrection input spec to include weight image and spline order. Made 
 	   argument formatting consistent. Cleaned ants.segmentation according to PEP8.

nipype/interfaces/base.py

@@ -758,8 +758,17 @@ def _get_trait_desc(self, inputs, name, spec):
         manhelpstr = ['\t%s' % name]
 
         type_info = spec.full_info(inputs, name, None)
+<<<<<<< HEAD
         default = ', nipype default value: %s' % spec.default_value()[1]
         line = "(%s%s)" % (type_info, default if spec.usedefault else '')
+=======
+        default = ''
+
+        if spec.usedefault:
+            default = ', nipype default value: %s' % str(spec.default_value()[1])
+
+        line = "(%s%s)" % (type_info, default)
+>>>>>>> master
         manhelpstr = wrap(line, 70,
                           initial_indent=manhelpstr[0]+': ',
                           subsequent_indent='\t\t ')