Got eval-or-indent working in scheme repl
Fixed merge conflict with origin