Merge pull request #636 from beOn/master

without this, line 151 tries to call a module

Author: satra

nipype/interfaces/nipy/model.py

@@ -20,7 +20,7 @@
  warnings.warn('nipy not installed')
 else:
  import nipy.modalities.fmri.design_matrix as dm
- import nipy.labs.glm as GLM
+ import nipy.labs.glm.glm as GLM
 
 if have_nipy:
  try: