Merge branch 'master' of github.com:MITx/mitx into jarv/dev-script-updates

cms/static/sass/_content-types.scss

@@ -56,10 +56,10 @@
 
 .module a:first-child {
   @extend .content-type;
-  background-image: url('/static/img/content-types/module.png');
+  background-image: url('../img/content-types/module.png');
 }
 
 .module a:first-child {
   @extend .content-type;
-  background-image: url('/static/img/content-types/module.png');
+  background-image: url('../img/content-types/module.png');
 }

lms/templates/courseware.html

@@ -18,14 +18,6 @@
   ##  <script type="text/javascript" src="${static.url('js/vendor/CodeMirror-2.25/mode/xml/xml.js')}"></script>
   ##  <script type="text/javascript" src="${static.url('js/vendor/CodeMirror-2.25/mode/python/python.js')}"></script>
 
-  ## image input: for clicking on images (see imageinput.html)
-  <script type="text/javascript" src="${static.url('js/vendor/imageinput.js')}"></script>
-
-  ## TODO (cpennington): Remove this when we have a good way for modules to specify js to load on the page
-  ## and in the wiki
-  <script type="text/javascript" src="${static.url('js/schematic.js')}"></script>
-  
-  
    <%static:js group='courseware'/>
 
   <%include file="mathjax_include.html" />