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

coverage in setup.py was 'fighting' with the git coverage in tox, also c...
Merge branch 'master' into fix-build-issues