Fix the imports for Plone 4.3
Pyflakes and Pep8 cleanup