Re-pep8 verify-mozconfigs because I suck at merging. r=catlee