Merge branch 'master' of factorcode.org:/git/factor

Conflicts:

	extra/bake/bake.factor

diff --cc extra/bake/bake.factor
index bcb7c2238f38c28754f32940938468dab2f9bada,db77d92720b8317f9496d587bd233c218af4b07b..0834c84c9a76b4c8d5004e3db238945306a72225
mode 100644,100755..100644
--- 1/extra/bake/bake.factor
--- 2/extra/bake/bake.factor
+++ b/extra/bake/bake.factor
@@@ -1,7 -1,7 +1,7 @@@
  
  USING: kernel parser namespaces sequences quotations arrays vectors splitting
-        strings words math
-        macros arrays.lib combinators.lib combinators.conditional newfx ;
 -       words math
 -       macros generalizations combinators.lib combinators.conditional newfx ;
++       strings words math generalizations
++       macros combinators.lib combinators.conditional newfx ;
  
  IN: bake