flake8 fixes

Hey @ghickman hope you don't mind but had a moment so fixed the merge conflict and the flake8 breakages I'd introduced (note that this targets #32)