Fixed some bugs introduced in "source jars"commit

It turns out that I pushed non-working code, very sorry about that. The current elisp code goes into infinite recursion when starting ensime  (I guess I never tested after restarting emacs). This commit fixes that, and also brings two unit tests up to date with the newer scalatest version.