Some org stuff. Run server. JS stuff.
Merge branch 'master' of github.com:karls/emacs.d