Fix super calls, flake8 clean-up.
Merge pull request #92 from enthought/fix/super-calls

Fix super calls