Merge pull request #2645 from reaperhulk/pypy-use-the-coverage

properly merge pypy coverage with coveragerc paths