pep8
Re-apply change of "assertIsNone" to "assertEquals" to satisfy Py 2 support req't.
Merge pull request #1 from gjhiggins/master

merge recent fixes from main, pep8