Fix typos

Fixed typos, 2 were part of the code, and 7 in docstring or comments.
Merge pull request #2004 from Acebulf/master

Fixed bug resulting from typo in sho1d.py