Fix indentation
Disable yet another, new visual indent complaint from pep8

I would honor the continuation line complaints, but given that Python
mode in emacs is not cooperative in the slightest I'm considering it a
non-starter.
Re-spell set inclusion a more idiomatic way

Found by pyflakes.