Collect coverage for bok-choy tests
Merge pull request #2301 from edx/will/bok-choy-coverage

Collect coverage for bok-choy tests
Anadelta Template Update
Merge remote-tracking branch 'edx/master'