PEP-8 conformance improvements

[timleslie]

Updates to make master branch pep8 clean once again.

[coveralls]

Coverage remained the same when pulling 24f462856766f26786574e3a2dd543bfd1eba56a on timleslie:master into b73ec23 on scipy:master.

[rgommers]

Hi Tim, it's only the last commit that needs to go in right? Something always goes wrong if you merge master into your feature branch - the clean way to do this would be to just update your master to be in sync with scipy master, create a new branch from there, and then make your changes.

[timleslie]

You're right, it is only the latest commit that needs to go in. Let me
clean up my branches and I'll resubmit the PR more cleanly.

On Tue, Nov 12, 2013 at 8:01 AM, Ralf Gommers notifications@github.comwrote:

Hi Tim, it's only the last commit that needs to go in right? Something
always goes wrong if you merge master into your feature branch - the clean
way to do this would be to just update your master to be in sync with scipy
master, create a new branch from there, and then make your changes.

—
Reply to this email directly or view it on GitHubhttps://github.com//pull/3052#issuecomment-28238298
.

[timleslie]

Hi Ralf,

I've fixed up this PR to be a single commit directly on top of the current scipy/master. Should be good to go.

Cheers,

Tim

[coveralls]

Coverage remained the same when pulling 6a6c66d on timleslie:master into f9386ac on scipy:master.

[rgommers]

Thanks Tim, looks good.