Add make ensime. bump emacs for rewrite of all emacs commits.