edx/edx-platform — pull request #1827 by singingwolfboy (2013-12-03 19:44:58+00:00)
Title: settings.MITX_FEATURES => settings.FEATURES

Part 2 of #1815

@gwprice @feanil