PEP8 cleanup--whitespace fixes and optimize imports.
Merge pull request #50 from eucalyptus/pep8_cleanup

PEP8 cleanup--whitespace fixes and optimize imports.
Merge pull request #2 from eucalyptus/master

Merged upstream after pep8_cleanup