revert emacs client support
allow custom org export command
fix conflict