Merge pull request #684 from reaperhulk/some-style-fixes

Some style fixes suggested by pep8-naming
add pep8-naming to pep8 tests
updates to make the project pep8-naming clean