Typeos

Reopening of the following PR while responded to feedback: https://github.com/scikit-learn/scikit-learn/pull/1448


For some reason, github was displaying a bunch of commits and changes I did not make that are part of the original branch even though I properly updated my branch and such. This PR now contains exactly the changes I made and no others.