merge
tkregister fix
tkregister fix
merge
Merge branch 'master' into tkregister2_cmdl

* master: (28 commits)
  fix: add nose to requirements
  fix: conda install without prompt
  fix: conda install
  tst: enable py26 testing
  fix: change nipype:value to prov:value
  fix: merge rdfs:label export from upstream
  Autotest file of camino/dti.py DTMetric interface
  BUG: antsRegistration command line failure
  fix: auto test
  Camino update
  Add header option for camino.dti.DTMetric
  Correct PEP8
  New interface for Camino dtshape. Minor correction to Camino ComputeEigensystem
  Commiting again same thing
  Camino update
  fixed outputs assignment
  fix refit
  doc: added reference to BSplineSyn
  fix: allow 4 parameters for antsRegistration transform
  fix: cleaned prov
  ...
fix vox2vox option
fix typo
Respect bsub_args set by workflow (fixes #772).
fix: spm example
Merge pull request #773 from medihack/master

Respect bsub_args set by workflow (fixes #772).
Merge pull request #775 from satra/fix/spmexample

fix: spm example
merge
merge
add mri_compute_volume fraction interface
bim
Merge branch 'master' into tkregister2_cmdl

* master: (111 commits)
  fix: spm example
  Respect bsub_args set by workflow (fixes #772).
  1,2,3,4 DONE. Test_auto_XFibres.py generated.
  fix: sorted output for all auto tests
  fix: added newlines
  fix: write sorted tests
  Gradnonlin option added to xfibers
  fix: enable enumeration of moving transform feature selection
  fix: support for stricter checking with ants bsplinesyn
  TST+BF: Improve DataFinder tests, fix issue with unpack_single and sorting
  regex matching bug fixed in interfaces.spm.model
  order matters when you do sorting
  PEP8 and fixed out_paths sort
  added test for sorting, fixed tuples
  added sorting
  test for datafinder
  ENH: .travis.yml - no need for apt-get update -qq (neurodebian magical script does it), travis_retry to robustify apt-get from neurodebian
  BF: Fix DataFinder bug introduced in d985f677
  enh: Add support for spm/mcr config via env vars
  Catch only KeyErrors when checking for env var
  ...
add to init
merge
merge