Fixed docstrings and added compatibility with nipype master (fsl.GLM)
Merge pull request #207 from chrisfilo/fix/GLM

Fixed docstrings and added compatibility with nipype master (fsl.GLM)