Merge branch 'devel-rhodri' of github:/rhodricusack/automaticanalysis into devel-rhodri
Major changes to parallel dependency system
Major changes to parallel dependency system
Merge branch 'develop' of github:/rhodricusack/automaticanalysis into devel-rhodri
updated cprintf
Merge branch 'devel-rhodri' of github:/rhodricusack/automaticanalysis into devel-rhodri
Fixed bugs in tasklist branching behaviour.  Added wildcard options to aas_addcovariate.
clear the aacache at the start of doprocessing
mfile alias was incorrect in the autoidentifyseries_timtrio .xml file
Update README.md
Fixed a bug in branching behaviour that was breaking nested sub branches. Code is a lot cleaner now, too.
updates from neurana
resolving conflicts
resolved conflicts
Added DICOM conversion split for T1/T2 with general m file aamod_convert_structural; begun adding flexibility to firstlevel modeling
Merge branch 'devel-rhodri' of github.com:rhodricusack/automaticanalysis into devel-rhodri
Fixed merges in aarecipe.m. *VERY SORRY IF MESSED ANYTHING UP.*
Restored aarecipe.m to previously committed version,w hich includes conflicts.
Merge branch 'devel-rhodri' of github:/rhodricusack/automaticanalysis into devel-rhodri
adding new module for doing seed-based functional connectivity