Fixes problems with flake8 due to pep8 update

Two things to note:
- I broke the nice indenting you had in settings_default.py :/
- There some pieces of commented code, could they be deleted? They don't have a comment saying why they should be commented.