Update SExp rendering and cleanup code
Merge pull request #544 from rorygraves/sexp_cleanup

Update SExp rendering and cleanup code
Revert "Update SExp rendering and cleanup code"
Merge pull request #547 from ensime/revert-544-sexp_cleanup

Revert "Update SExp rendering and cleanup code"