Minor cleanup of Scientific Python 2 exercise
Merge branch 'master' into gh-pages