Merge pull request #122 from newbery/edx-master

Make the tox tests work
Merge branch 'master' of github.com:edx/diff-cover