Fix formatting.
Merge branch 'master' of github.com:aemoncannon/ensime
Fix a couple elisp breaks w.r.t server debug changes.