see below

  remove blank line, make json ext work, and comment out ensime
  make GIT_EDITOR=emacsclient, so I commit from ansi-term, ec doesn't
    wait so the commit is aborted.  Call server-edit in the commit message
    after saving, with C-x #