edx/configuration — pull request #1154 by trungpham (2014-06-02 21:21:37+00:00)
Title: pull edx-configuration from private repo

Original pull request: https://github.com/edx/configuration/pull/787

I've submitted the CLA and resolved the merge conflict.