Add combined coverage to `rake coverage`
Merge pull request #791 from edx/sarina/rake_coverage_combined

Add combined coverage to `rake coverage`