c
Merge branch 'master' of https://github.com/miniukov/configfiles
pep 8 changes