Remove unused import, which was breaking Python 3

Also remove trailing whitespace
Merge branch 'master' of github.com:ContinuumIO/conda

Conflicts:
	conda/builder/pypi.py