SIGN IN SIGN UP

Merge: PEP8 fixup on previous patch, remove unused imports in test_email.

R
R David Murray committed
965794ed5893882b5b0e49ce17ef9e137cfa9db1