Basic support for multiple local lisp implementations, though I haven't added SBCL yet
Merged latest from origin/master