diff --git a/conf/locale/config.yaml b/conf/locale/config.yaml
index 38d4947aa8..467e607035 100644
--- a/conf/locale/config.yaml
+++ b/conf/locale/config.yaml
@@ -2,84 +2,84 @@
 
 locales:
     - en  # English - Source Language
-    - am  # Amharic
+    # - am  # Amharic
     - ar  # Arabic
-    - az  # Azerbaijani
-    - bg_BG  # Bulgarian (Bulgaria)
-    - bn_BD  # Bengali (Bangladesh)
-    - bn_IN  # Bengali (India)
-    - bs  # Bosnian
-    - ca  # Catalan
-    - ca@valencia  # Catalan (Valencia)
-    - cs  # Czech
-    - cy  # Welsh
-    - da  # Danish
-    - de_DE  # German (Germany)
-    - el  # Greek
-    - en_GB  # English (United Kingdom)
-    # Don't pull these until we figure out why pages randomly display in these locales,
-    # when the user's browser is in English and the user is not logged in.
-#    - en@lolcat  # LOLCAT English
-#    - en@pirate  # Pirate English
+    # - az  # Azerbaijani
+    # - bg_BG  # Bulgarian (Bulgaria)
+    # - bn_BD  # Bengali (Bangladesh)
+    # - bn_IN  # Bengali (India)
+    # - bs  # Bosnian
+    # - ca  # Catalan
+    # - ca@valencia  # Catalan (Valencia)
+    # - cs  # Czech
+    # - cy  # Welsh
+    # - da  # Danish
+    # - de_DE  # German (Germany)
+    # - el  # Greek
+    # - en_GB  # English (United Kingdom)
+    # # Don't pull these until we figure out why pages randomly display in these locales,
+    # # when the user's browser is in English and the user is not logged in.
+    # #- en@lolcat  # LOLCAT English
+    # #- en@pirate  # Pirate English
     - es_419  # Spanish (Latin America)
-    - es_AR  # Spanish (Argentina)
-    - es_EC  # Spanish (Ecuador)
-    - es_ES  # Spanish (Spain)
-    - es_MX  # Spanish (Mexico)
-    - es_PE  # Spanish (Peru)
-    - et_EE  # Estonian (Estonia)
-    - eu_ES  # Basque (Spain)
-    - fa  # Persian
-    - fa_IR  # Persian (Iran)
-    - fi_FI  # Finnish (Finland)
-    - fil  # Filipino
+    # - es_AR  # Spanish (Argentina)
+    # - es_EC  # Spanish (Ecuador)
+    # - es_ES  # Spanish (Spain)
+    # - es_MX  # Spanish (Mexico)
+    # - es_PE  # Spanish (Peru)
+    # - et_EE  # Estonian (Estonia)
+    # - eu_ES  # Basque (Spain)
+    # - fa  # Persian
+    # - fa_IR  # Persian (Iran)
+    # - fi_FI  # Finnish (Finland)
+    # - fil  # Filipino
     - fr  # French
-    - gl  # Galician
-    - gu  # Gujarati
+    # - gl  # Galician
+    # - gu  # Gujarati
     - he  # Hebrew
     - hi  # Hindi
-    - hr  # Croatian
-    - hu  # Hungarian
-    - hy_AM  # Armenian (Armenia)
-    - id  # Indonesian
-    - it_IT  # Italian (Italy)
-    - ja_JP  # Japanese (Japan)
-    - kk_KZ  # Kazakh (Kazakhstan)
-    - km_KH  # Khmer (Cambodia)
-    - kn  # Kannada
+    # - hr  # Croatian
+    # - hu  # Hungarian
+    # - hy_AM  # Armenian (Armenia)
+    # - id  # Indonesian
+    # - it_IT  # Italian (Italy)
+    # - ja_JP  # Japanese (Japan)
+    # - kk_KZ  # Kazakh (Kazakhstan)
+    # - km_KH  # Khmer (Cambodia)
+    # - kn  # Kannada
     - ko_KR  # Korean (Korea)
-    - lt_LT  # Lithuanian (Lithuania)
-    - ml  # Malayalam
-    - mn  # Mongolian
-    - mr  # Marathi
-    - ms  # Malay
-    - nb  # Norwegian Bokmål
-    - ne  # Nepali
-    - nl_NL  # Dutch (Netherlands)
-    - or  # Oriya
-    - pl  # Polish
+    # - lt_LT  # Lithuanian (Lithuania)
+    # - ml  # Malayalam
+    # - mn  # Mongolian
+    # - mr  # Marathi
+    # - ms  # Malay
+    # - nb  # Norwegian Bokmål
+    # - ne  # Nepali
+    # - nl_NL  # Dutch (Netherlands)
+    # - or  # Oriya
+    # - pl  # Polish
     - pt_BR  # Portuguese (Brazil)
-    - pt_PT  # Portuguese (Portugal)
-    - ro  # Romanian
+    # - pt_PT  # Portuguese (Portugal)
+    # - ro  # Romanian
     - ru  # Russian
-    - si  # Sinhala
-    - sk  # Slovak
-    - sl  # Slovenian
-    - sq  # Albanian
-    - sr  # Serbian
-    - sv  # Swedish
-    - sw  # Swahili
-    - ta  # Tamil
-    - te  # Telugu
-    - th  # Thai
-    - tr_TR  # Turkish (Turkey)
-    - uk  # Ukranian
-    - ur  # Urdu
-    - uz  # Uzbek
-    - vi  # Vietnamese
+    # - si  # Sinhala
+    # - sk  # Slovak
+    # - sl  # Slovenian
+    # - sq  # Albanian
+    # - sr  # Serbian
+    # - sv  # Swedish
+    # - sw  # Swahili
+    # - ta  # Tamil
+    # - te  # Telugu
+    # - th  # Thai
+    # - tr_TR  # Turkish (Turkey)
+    # - uk  # Ukranian
+    # - ur  # Urdu
+    # - uz  # Uzbek
+    # - vi  # Vietnamese
     - zh_CN  # Chinese (China)
-    - zh_HK  # Chinese (Hong Kong)
-    - zh_TW  # Chinese (Taiwan)
+    # - zh_HK  # Chinese (Hong Kong)
+    # - zh_TW  # Chinese (Taiwan)
 
 
 # The locales used for fake-accented English, for testing.
diff --git a/requirements/edx/github.txt b/requirements/edx/github.txt
index c2694e8245..e9ebc3a8f2 100644
--- a/requirements/edx/github.txt
+++ b/requirements/edx/github.txt
@@ -39,7 +39,7 @@ git+https://github.com/pmitros/pyfs.git@96e1922348bfe6d99201b9512a9ed946c87b7e0b
 -e git+https://github.com/edx/edx-submissions.git@8fb070d2a3087dd7656d27022e550d12e3b85ba3#egg=edx-submissions
 -e git+https://github.com/edx/opaque-keys.git@1254ed4d615a428591850656f39f26509b86d30a#egg=opaque-keys
 -e git+https://github.com/edx/ease.git@97de68448e5495385ba043d3091f570a699d5b5f#egg=ease
--e git+https://github.com/edx/i18n-tools.git@0f6abacfb96a7a8884b3e0bf8e7489c7d4c6a6c5#egg=i18n-tools
+-e git+https://github.com/edx/i18n-tools.git@7b89d5e01c1a7cc5d69d813bd8c6b706a8f75119#egg=i18n-tools
 -e git+https://github.com/edx/edx-oauth2-provider.git@0.5.1#egg=oauth2-provider
 -e git+https://github.com/edx/edx-val.git@d6087908aa3dd05ceaa7f56a21284f86c53cb3f0#egg=edx-val
 -e git+https://github.com/pmitros/RecommenderXBlock.git@9b07e807c89ba5761827d0387177f71aa57ef056#egg=recommender-xblock