pep8 indentation adjustments that agree w/ Salt style guide
Merge pull request #6627 from hulu/pep8-indents

pep8 indentation adjustments that agree w/ Salt style guide