Cleanup ZCML (indenting, empty lines between tags).
Cleanup pyflakes.
Cleanup pep8.