Merge remote branch 'nipype/master' into nitime

* nipype/master:
  BUG: antsRegistration command line failure
test for datafinder
added sorting
added test for sorting, fixed tuples
PEP8 and fixed out_paths sort
order matters when you do sorting
TST+BF: Improve DataFinder tests, fix issue with unpack_single and sorting
Merge pull request #6 from moloney/enh-df-tests-rebase

TST+BF: Improve DataFinder tests, fix issue with unpack_single and sorti...
fix: support for stricter checking with ants bsplinesyn
fix: enable enumeration of moving transform feature selection
Merge pull request #768 from satra/fix/antsbspline

fix: support for stricter checking with ants bsplinesyn
Gradnonlin option added to xfibers
fix: write sorted tests
fix: added newlines
fix: sorted output for all auto tests
Merge pull request #771 from satra/fix/makespec

auto-spec generation now sorts keys to track changes better
Merge pull request #765 from chrisfilo/enh/datafinder_test

Test and sorting for DataFinder
Merge remote-tracking branch 'upstream/master'
1,2,3,4 DONE. Test_auto_XFibres.py generated.
Merge pull request #770 from mick-d/master

Gradnonlin option added to xfibers