Fix test settings so all non-acceptance tests run
Merge pull request #530 from edx/will/fix-tests

Fix test settings so all non-acceptance tests run
Merge branch 'master' into authoring