sort pep8 task
fixed some pep8 style stuff
fixed merge with Makefile pep8 task