Merge branch 'master' into enh_afni_model

Author: rmarkello

nipype/interfaces/afni/__init__.py

@@ -15,10 +15,10 @@
                          Maskave, Means, OutlierCount,
                          QualityIndex, ROIStats, Retroicor,
                          Seg, SkullStrip, TCorr1D, TCorrMap, TCorrelate,
-                         TShift, Volreg, Warp, QwarpPlusMinus)
+                         TShift, Volreg, Warp, QwarpPlusMinus, Qwarp)
 from .svm import (SVMTest, SVMTrain)
-from .utils import (AFNItoNIFTI, Autobox, BrickStat, Calc, Copy, Edge3,
+from .utils import (AFNItoNIFTI, Autobox,Axialize, BrickStat, Calc, Copy, Edge3,
                     Eval, FWHMx,
                     MaskTool, Merge, Notes, Refit, Resample, TCat, TStat, To3D,
-                    Unifize, ZCutUp, GCOR, Zcat, Zeropad)
+                    Unifize, ZCutUp, GCOR,Zcat, Zeropad)
 from .model import (Deconvolve, Remlfit)