add pep8 plugin
fix conflicts
mend