* combined subjectsource and datagrabber into one * made datasink and freesurfersource traits compatible
* combined subjectsource and datagrabber into one * made datasink and freesurfersource traits compatible

git-svn-id: 24f545668198cdd163a527378499f2123e59bf9f@1264 ead46cd0-7350-4e37-8683-fc4c6f79bf00

JohnGriffiths/nipype,mick-d/nipype,gerddie/nipype,wanderine/nipype,JohnGriffiths/nipype,dgellis90/nipype,sgiavasis/nipype,grlee77/nipype,arokem/nipype,mick-d/nipype,rameshvs/nipype,gerddie/nipype,rameshvs/nipype,wanderine/nipype,JohnGriffiths/nipype,dgellis90/nipype,glatard/nipype,rameshvs/nipype,fprados/nipype,carlohamalainen/nipype,carolFrohlich/nipype,FredLoney/nipype,FredLoney/nipype,glatard/nipype,mick-d/nipype_source,arokem/nipype,glatard/nipype,dgellis90/nipype,iglpdc/nipype,blakedewey/nipype,blakedewey/nipype,carlohamalainen/nipype,wanderine/nipype,grlee77/nipype,FCP-INDI/nipype,gerddie/nipype,blakedewey/nipype,mick-d/nipype_source,satra/NiPypeold,carolFrohlich/nipype,Leoniela/nipype,satra/NiPypeold,pearsonlab/nipype,dgellis90/nipype,pearsonlab/nipype,glatard/nipype,Leoniela/nipype,FCP-INDI/nipype,mick-d/nipype_source,iglpdc/nipype,wanderine/nipype,dmordom/nipype,dmordom/nipype,mick-d/nipype,carlohamalainen/nipype,sgiavasis/nipype,grlee77/nipype,pearsonlab/nipype,Leoniela/nipype,christianbrodbeck/nipype,grlee77/nipype,sgiavasis/nipype,dmordom/nipype,arokem/nipype,fprados/nipype,blakedewey/nipype,carolFrohlich/nipype,rameshvs/nipype,JohnGriffiths/nipype,mick-d/nipype,fprados/nipype,christianbrodbeck/nipype,FCP-INDI/nipype,FCP-INDI/nipype,gerddie/nipype,carolFrohlich/nipype,FredLoney/nipype,iglpdc/nipype,iglpdc/nipype,sgiavasis/nipype,arokem/nipype,pearsonlab/nipype