Merge remote-tracking branch 'upstream/master' into ucsf_sge

Author: akeshavan

doc/_templates/layout.html

@@ -14,6 +14,12 @@
   ga('create', 'UA-339450-7', 'nipy.org/nipype');
   ga('send', 'pageview');
 </script>
+<script>
+  ((window.gitter = {}).chat = {}).options = {
+    room: 'nipy/nipype'
+  };
+</script>
+<script src="https://sidecar.gitter.im/dist/sidecar.v1.js" async defer></script>
 {% endblock %}
 
 {% block header %}

nipype/interfaces/freesurfer/utils.py

@@ -527,11 +527,6 @@ class ApplyMask(FSCommand):
     input_spec = ApplyMaskInputSpec
     output_spec = ApplyMaskOutputSpec
 
-    def _list_outputs(self):
-        outputs = self._outputs().get()
-        outputs["out_file"] = os.path.abspath(self.inputs.out_file)
-        return outputs
-
 
 class SurfaceSnapshotsInputSpec(FSTraitedSpec):