Merge branch 'reentrantvm' of git://github.com/phildawes/factor

diff --cc vm/code_block.cpp
Simple merge

diff --cc vm/gc.cpp
Simple merge

diff --cc vm/os-unix.cpp
Simple merge

diff --cc vm/quotations.cpp
Simple merge

diff --cc vm/vm.hpp
Simple merge