fix: topup when out_base is a path
Update test functions BEFORE tests
Merge remote-tracking branch 'upstream/master' into makefile
Fixes #933
moved the import inside the constructor
fix: change where nlmeans check is made
Merge remote-tracking branch 'upstream/master' into fix/topup

* upstream/master: (82 commits)
  tiny typo
  another attempt at fixing bash conditionals
  fixed bash conditionals
  added no dep install version. we'll be testing on both.
  Added xor option in Camino connectivity for robustness
  Conmat test function
  Added more connectivity matrix options in Camino interface
  Fixed tests.
  remove deb packages installation
  added apt caching
  fix: d3 change.
  switched to six.string_types for string type checks
  added external package: 'six'
  Mention AddNoise in the changelog
  Remove d3.min.js dependency
  Log cleanup
  Fixed tests
  Update README.rst
  Update links_names.txt
  Update index.rst
  ...
typo in nipype/workflows/dmri/fsl/epi.py
Merge pull request #937 from cni-md/master

typo in nipype/workflows/dmri/fsl/epi.py
Merge remote-tracking branch 'private/fix/dipy_tests'

* private/fix/dipy_tests:
  moved the import inside the constructor
  Fixes #933
Merge pull request #928 from satra/fix/topup

fix: topup when out_base is a path
Merge remote-tracking branch 'upstream/master' into fix/dipy

* upstream/master:
  typo in nipype/workflows/dmri/fsl/epi.py
  tiny typo
  Add tests
  another attempt at fixing bash conditionals
  fixed bash conditionals
  added no dep install version. we'll be testing on both.
  Added xor option in Camino connectivity for robustness
  Conmat test function
  Added more connectivity matrix options in Camino interface
  Fixed tests.
  remove deb packages installation
  fix: topup when out_base is a path
  [algorithms] Overlap interface revision
Merge pull request #939 from satra/fix/dipy

Fix/dipy
fix: resolved conflict
fix: many miscellaneous fixes - mostly styles - but also for doc building the ipython extension has moved to ipython
fix: remove code added by oscar
fix: clean up auto tests
Merge pull request #940 from satra/fix/misc

Fix/misc
Merge pull request #932 from mick-d/makefile

Update test functions BEFORE tests
BF: include nipype.workflows.data into setup.py