local changes before pull
Merge branch 'master' of https://github.com/cswelcher/scripts
broke off parts of coverage.py into function, some cleanup