Added a space on the line break.
Merge branch 'nipy-dipy-master' into correct_typo
Added some words to a print
Merge branch 'upstream_master' into correct_typo
Typo in median otsu
Fixed typo in example
Merge branch 'upstream_master' into correct_typo

Conflicts:
	dipy/segment/mask.py
	doc/examples/brain_extraction_dwi.py
stuff
Update brain_extraction_dwi.py
Fixed more stuff
Merge pull request #245 from samuelstjean/correct_typo

Fix some rewording