Lemur fixes.

- Fix spot-check-history.
- Further fix output of spot-check-history and display-types;
  cl-format doesn't flush *out*.
- Clean up shell_test. It was broken with JAVA_HOMEs like
  "/usr/lib/jvm/java-6-sun/jre".
Quick follow-up.

Condense test-merge-env-2.  I'm still getting the hang of this Clojure deal.
Fix-ups in response to code review.
Merge pull request #18 from jeddenlea/master

Misc fixes.