Fix pylint errors

And failing unit test. Fixes #79
Merge pull request #80 from jrrideout/death-march

Fix pylint errors