added FSLGLM

Conflicts:

	nipype/interfaces/fsl/__init__.py
	nipype/interfaces/fsl/model.py
Merge and clean up FSLGLM into GLM.
PEP8
fix imports
Merge pull request #604 from chrisfilo/enh/GLM

Enh/glm