A few PEP-8 tweaks

Eliminates PEP-8 errors and merge conflicts w/ outstanding PEP-8 PR request against pytools/toolz/master