edx/edx-platform — pull request #6181 by benpatterson (2014-12-08 18:41:17+00:00)
Title: Revert "Jarv/config refactor wip"

Reverts edx/edx-platform#6096

Looks like this affected our CI environment. Re-running with this PR.