Merged with master, fixed simple conflicts. Left changes from oesteba…

…n regarding encoding comment and imports for Python 3 compatability.

nipype/interfaces/brainsuite/brainsuite.py

@@ -1,14 +1,16 @@
-"""This script provides interfaces for BrainSuite command line tools.
-Please see brainsuite.org for more information.
-
-Author: Jason Wong
-"""
+# -*- coding: utf-8 -*-
+from __future__ import print_function, division, unicode_literals, absolute_import
 
 import os
 import re as regex
 
 from ..base import TraitedSpec, CommandLineInputSpec, CommandLine, File, traits, isdefined
 
+"""This script provides interfaces for BrainSuite command line tools.
+Please see brainsuite.org for more information.
+
+Author: Jason Wong
+"""
 
 class BseInputSpec(CommandLineInputSpec):