Limit pep8 to "keystone" and "test" directories
Fix pep8 warnings after merging
Revert other parts of b63b20bdb