edx/edx-ora2 — pull request #530 by wedaly (2014-07-24 13:57:54+00:00)
Title: Fix test settings so all non-acceptance tests run

Too many layers of indirection :( This was causing all tests to be skipped, including non-selenium tests.