use em-smart in eshell
- revert back to js-mode
- org tweaks