@jbau: also did manually removed MITX_FEATURES and mitxmako refs
in edx-west parts of code
Release for Dec 19, 2013
Conflicts:
cms/envs/test.py
common/djangoapps/external_auth/views.py
common/djangoapps/student/tests/factories.py
common/djangoapps/student/views.py
lms/djangoapps/branding/tests.py
lms/djangoapps/branding/views.py
lms/djangoapps/courseware/tests/test_views.py
lms/djangoapps/instructor/views/legacy.py
lms/templates/courseware/course_about.html
lms/templates/navigation.html
lms/urls.py
