Merge pull request #22 from chadlung/master

A few fixes to make tox and Jenkins happy
Get Jenkins working with code coverage, etc.