fixed pep8 formatting issues, add flake8 to travis
merge origin