Fix flake8 errors.
Merge branch 'develop' of https://github.com/icereval/waterbutler into develop
Fix failing tests.