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

diff --cc extra/boids/ui/ui.factor
Simple merge

diff --cc extra/lsys/ui/ui.factor
Simple merge

diff --cc extra/regexp/regexp.factor
index 8872338f5d1159a3aa10039a5a2c26406c4feae2,bdf0c411b280ccc5a422540590b4085ea142e728..29f3c500c7f88d0af4fef138ac405f116fcab219
--- 1/extra/regexp/regexp.factor
--- 2/extra/regexp/regexp.factor
+++ b/extra/regexp/regexp.factor
@@@ -1,7 -1,8 +1,8 @@@
  USING: arrays combinators kernel lists math math.parser
 -namespaces parser parser-combinators parser-combinators.simple
 +namespaces parser lexer parser-combinators parser-combinators.simple
  promises quotations sequences combinators.lib strings math.order
- assocs prettyprint.backend memoize unicode.case unicode.categories ;
+ assocs prettyprint.backend memoize unicode.case unicode.categories
+ combinators.short-circuit ;
  USE: io
  IN: regexp