Merge branch 'master' into online_preproc

* master: (21 commits)
  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
  Fix inconsistent indentation
  Fixed tests
  ...
add option for processing nifti file instead of dicoms
wip
merge
add interface to perform separate intensity correction and grayordinates resampling
Merge remote branch 'nipype/master' into online_preproc

* nipype/master:
  fix: spm example
  Respect bsub_args set by workflow (fixes #772).
merge
fix inputs
Merge branch 'online_preproc' into testing_tmp

* online_preproc:
  fix inputs
add poly_order trait
Merge branch 'online_preproc' into testing_tmp

* online_preproc:
  add poly_order trait