Merge remote-tracking branch 'upstream/master' into ref/Node-cleanup

Author: oesteban

.mailmap

@@ -1,5 +1,6 @@
 Aimi Watanabe <[email protected]> stymy <[email protected]>
 Aimi Watanabe <[email protected]> stymy <[email protected]>
+Alejandro de la Vega <[email protected]> adelavega <[email protected]>
 Alexander Schaefer <[email protected]> Alexander Schaefer <[email protected]>
 Alexander Schaefer <[email protected]> alexschaefer83 <[email protected]>
 Alexander Schaefer <[email protected]> aschaefer <aschaefer@aschaefer-U36SD.(none)>
@@ -56,11 +57,13 @@ Franz Liem <[email protected]> fliem <franz.liem>
 Gael Varoquaux <[email protected]> GaelVaroquaux
 Gael Varoquaux <[email protected]> GaelVaroquaux <[email protected]>
 Gavin Cooper <[email protected]> gjcooper <[email protected]>
+Gilles de Hollander <[email protected]> Gilles86 <[email protected]>
 Hans Johnson <[email protected]> Hans Johnson <[email protected]>
 Hans Johnson <[email protected]> hjmjohnson <[email protected]>
 Horea Christian <[email protected]> Horea Christian <[email protected]>
 Isaac Schwabacher <[email protected]> ischwabacher <[email protected]>
 James Kent <[email protected]> jdkent <[email protected]>
+Jakub Kaczmarzyk <[email protected]> kaczmarj <[email protected]>
 Jason Wong <[email protected]> Jason <[email protected]>
 Jason Wong <[email protected]> jason <[email protected]>
 Jason Wong <[email protected]> Jason W <[email protected]>
@@ -72,7 +75,9 @@ Joerg Stadler <[email protected]> Jörg Stadler <Stadler@lin-magdeb
 Joke Durnez <[email protected]> jokedurnez <[email protected]>
 Josh Warner <[email protected]> Josh Warner (Mac) <[email protected]>
 Kai Schlamp <[email protected]> medihack <[email protected]>Jessica Forbes <[email protected]> jessicaforbes <[email protected]>
+Kevin Sitek <[email protected]> sitek <[email protected]>
 Leonie Lampe <[email protected]> Leonie Lmape <[email protected]>
+Lukas Snoek <[email protected]> Lukas Snoek <[email protected]>
 Mathias Goncalves <[email protected]> mathiasg <[email protected]>
 Michael Dayan <[email protected]> Michael <[email protected]>
 Michael Dayan <[email protected]> Michael <[email protected]>
@@ -102,5 +107,6 @@ Steven Giavasis <[email protected]> sgiavasis <[email protected]>
 Tristan Glatard <[email protected]> Tristan Glatard <[email protected]>
 Victor Saase <[email protected]> vsaase <[email protected]>
 William Triplett <[email protected]> William Triplett <[email protected]>
+Wolfgang Pauli <[email protected]> Wolfgang Pauli <[email protected]>
 Yaroslav Halchenko <[email protected]> Yaroslav Halchenko <[email protected]>
 pipolose <[email protected]> pipolose <[email protected]>

.travis.yml

@@ -59,4 +59,4 @@ deploy:
     tags: true
     repo: nipy/nipype
     branch: master
-  distributions: "sdist"
+  distributions: "sdist bdist_wheel"