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

Conflicts:
	Makefile

diff --cc .gitignore
Simple merge

diff --cc Makefile
index 5e67bb1,a120480..56542e8
--- 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 \
 +IMPLS = bash c clojure coffee cs forth fsharp go haskell java js lua make mal \
-       ocaml matlab miniMAL perl php ps python r racket ruby rust \
-       scala vb nim
+       ocaml matlab miniMAL nim perl php ps python r racket ruby rust \
+       scala vb
  
  step0 = step0_repl
  step1 = step1_read_print
@@@ -116,13 -111,11 +113,12 @@@ ruby_RUNSTEP =    ruby ../$(2) $(3
  rust_RUNSTEP =    ../$(2) $(3)
  scala_RUNSTEP =   sbt 'run-main $($(1))$(if $(3), $(3),)'
  vb_RUNSTEP =      mono ../$(2) --raw $(3)
- nim_RUNSTEP =     ../$(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
 +cs_TEST_OPTS =     --mono
 +fsharp_TEST_OPTS = --mono
 +mal_TEST_OPTS =    --start-timeout 60 --test-timeout 120
 +vb_TEST_OPTS =     --mono
  
  
  # Derived lists