Merge branch 'mchang/acceptance-testing' of https://github.com/MITx/mitx into mchang/acceptance-testing