Fix handling of zip (i.e., izip) in Python 2

Clean up imports as well.

Thanks to @tboggs for the bug report.