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

diff --combined basis/tools/deploy/shaker/shaker.factor
index 0284891ebecac9e1574391a5de9d2c3e917745df,7fe2db96a0a750729fee605b7d5c4564f46b21ff..79335fd0320ebf37ace7db5fab04693a7ec2e0e3
--- 1/basis/tools/deploy/shaker/shaker.factor
--- 2/basis/tools/deploy/shaker/shaker.factor
+++ b/basis/tools/deploy/shaker/shaker.factor
@@@ -157,7 -157,8 +157,8 @@@ IN: tools.deploy.shake
                  "specializer"
                  "step-into"
                  "step-into?"
-                 "superclass"
+                 ! UI needs this
+                 ! "superclass"
                  "transform-n"
                  "transform-quot"
                  "tuple-dispatch-generic"
@@@ -276,6 -277,7 +277,6 @@@
                  lexer-factory
                  print-use-hook
                  root-cache
 -                vocab-roots
                  vocabs:dictionary
                  vocabs:load-vocab-hook
                  word