fix pep8
Merge pull request #505 from askeing/fix_pep8

PEP8 and Indent fixes
Merge remote-tracking branch 'mozilla/master' into issue_493