some style fixes suggested by pep8-naming
Merge pull request #684 from reaperhulk/some-style-fixes

Some style fixes suggested by pep8-naming