Revert "Fix ensime-server#420: move everything out of ensime.el"

This reverts commit 5bc7a2687de5793cc2a8ce58d5fcc61c1a5fbdb1 which shouldn't have been pushed