added JS stuff
Merge branch 'master' of https://github.com/timdrichards/emacs-config