Pyflakes imports clean
Merge pull request #759 from caktus/pyflakes

Pyflakes import clean