Fix style inconsistency with "and" on continuation line.

Author: gvanrossum

pep-0008.txt

@@ -147,8 +147,8 @@ Acceptable options in this situation include, but are not limited to::
         do_something()
 
     # Add some extra indentation on the conditional continuation line.
-    if (this_is_one_thing
-            and that_is_another_thing):
+    if (this_is_one_thing and
+            that_is_another_thing):
         do_something()
 
 The closing brace/bracket/parenthesis on multi-line constructs may