pep8 cleanup
Merge branch 'master' of 156.111.43.151:/opt/git/sima
flaking and linting