javascript stuff
Fix color-theme compile error
Add web-mode and disable individual web modes (html, css, etc)
Merge branches 'js-stuff' and 'master'