fixed a bug in statistics
BF: defult z-values are now reosnable. An alternative would be to use Nans.
ENH: better documentation of the contrast function
BF: convert frametimes to array upon design matrix creation
ENH: Change the default for GLM specification: `ols` instead of `ar1`
almost last changes... =] the end has no end
do not mix lists
do not mix lists
Merge pull request #303 from bthirion/glm_fixes

MRG: Glm fixes
kalinka kalinka maya
ff
Merge remote branch 'upstream/master' into slice_motion_correction

* upstream/master:
  ENH: Change the default for GLM specification: `ols` instead of `ar1`
  BF: convert frametimes to array upon design matrix creation
  ENH: better documentation of the contrast function
  BF: defult z-values are now reosnable. An alternative would be to use Nans.
  fixed a bug in statistics
Merge branch 'slice_motion_correction' into testing

* slice_motion_correction:
  kalinka kalinka maya
  do not mix lists
  do not mix lists
  almost last changes... =] the end has no end
  ENH: Change the default for GLM specification: `ols` instead of `ar1`
  BF: convert frametimes to array upon design matrix creation
  ENH: better documentation of the contrast function
  BF: defult z-values are now reosnable. An alternative would be to use Nans.
  fixed a bug in statistics
register motion frame if long motion
Merge branch 'slice_motion_correction' into testing

* slice_motion_correction:
  register motion frame if long motion