tabs for indents, empty lines are just that

we had mixed indentation, changed it all to tabs
there were "empty" lines with indentation characters, cleared them out
reverted changes to settings.py