Merge pull request #252 from SuperCowPowers/fix-build-issues

coverage in setup.py was 'fighting' with the git coverage in tox, also c...
couple of small fixes
Merge branch 'master' into fix-build-issues
Merge pull request #254 from SuperCowPowers/fix-build-issues

Fix build issues
Merge branch 'master' into cli-work