A few fixes to make tox and Jenkins happy
Merge pull request #22 from chadlung/master

A few fixes to make tox and Jenkins happy