buildout fixes from 996c7950ccca49567693b890f37f113a227fff80
pep8 fixes
pylint fixes
Merge branch 'buildout-fixes' into develop
Merge branch 'lint-fixes' into develop