Merge branch 'master' of github.com:kanaka/mal into guile

diff --cc Makefile
index f1e6b2b,9030dd8..7aec27e
--- 1/Makefile
--- 2/Makefile
+++ b/Makefile
@@@ -113,13 -111,9 +113,11 @@@ ruby_RUNSTEP =    ruby ../$(2) $(3
  rust_RUNSTEP =    ../$(2) $(3)
  scala_RUNSTEP =   sbt 'run-main $($(1))$(if $(3), $(3),)'
  vb_RUNSTEP =      mono ../$(2) --raw $(3)
 +# needs TERM=dumb to work with readline
 +guile_RUNSTEP =   guile ../$(2) $(3)
  
  # Extra options to pass to runtest.py
- cs_TEST_OPTS =  --mono
  mal_TEST_OPTS = --start-timeout 60 --test-timeout 120
- vb_TEST_OPTS =  --mono
  
  
  # Derived lists