Updated pycov to handle both 'coverage' and 'python-coverage'
Merge remote-tracking branch 'origin/master'