merge upstream

diff --cc Makefile
index 73e978b,63c8d06..3d8da91
--- 1/Makefile
--- 2/Makefile
+++ b/Makefile
@@@ -10,9 -10,9 +10,9 @@@ PYTHON = pytho
  # Settings
  #
  
- IMPLS = bash c clojure coffee cs forth go haskell java js lua make mal \
-       ocaml matlab miniMAL nim perl php ps python r racket ruby rust \
-       scala swift vb guile
+ IMPLS = bash c clojure coffee cpp cs factor forth go haskell java \
+       julia js lua make mal ocaml matlab miniMAL nim perl php ps \
 -      python r racket ruby rust scala swift vb
++      python r racket ruby rust scala swift vb guile
  
  step0 = step0_repl
  step1 = step1_read_print