address comments on https://github.com/scipy/scipy/pull/2510

Sorry I'm not so great at using git.  I am just adding a few commits to an existing pull request https://github.com/scipy/scipy/pull/2510