Merge branch 'feature/cale/cms-master' of github.com:MITx/mitx into bug/dhm/dec12

common/lib/xmodule/xmodule/js/spec/.gitignore

+*.js
+

common/lib/xmodule/xmodule/js/src/.gitignore

+*.js
+

common/lib/xmodule/xmodule/video_module.py

@@ -22,7 +22,8 @@ class VideoModule(XModule):
          resource_string(__name__, 'js/src/video/display.coffee')] +
         [resource_string(__name__, 'js/src/video/display/' + filename)
          for filename
-         in sorted(resource_listdir(__name__, 'js/src/video/display'))]}
+         in sorted(resource_listdir(__name__, 'js/src/video/display'))
+         if filename.endswith('.coffee')]}
     css = {'scss': [resource_string(__name__, 'css/video/display.scss')]}
     js_module_name = "Video"
 

requirements.txt

@@ -15,7 +15,7 @@ fs
 beautifulsoup 
 beautifulsoup4
 feedparser
-requests
+requests==0.14.2
 http://sympy.googlecode.com/files/sympy-0.7.1.tar.gz
 newrelic
 glob2