Merge pull request #1 from bluemoon/master

Updating isort to work with flake8/pyflakes