Merge branch 'master' into new_ui

diff --cc basis/tools/deploy/macosx/macosx.factor
index ede833d4487b660b31a0dbbb48904dc5fe1f284b,8fe31ac6ccd756ad417b7e2b12698700865ce620..11e2b8957b8ce96e2ae40b806a31c34e24a404ab
mode 100644,100755..100755
--- 1/basis/tools/deploy/macosx/macosx.factor
--- 2/basis/tools/deploy/macosx/macosx.factor
+++ b/basis/tools/deploy/macosx/macosx.factor
@@@ -42,14 -45,16 +42,14 @@@ IN: tools.deploy.macos
  
  : create-app-dir ( vocab bundle-name -- vm )
      [
 -        nip {
 -            [ copy-dll ]
 -            [ copy-freetype ]
 -            [ copy-nib ]
 -            [ "Contents/Resources/" copy-fonts ]
 -            [ "Contents/Resources" append-path make-directories ]
 -        } cleave
 +        nip
 +        [ copy-dll ]
 +        [ copy-nib ]
 +        [ "Contents/Resources" append-path make-directories ]
 +        tri
      ]
      [ create-app-plist ]
-     [ "Contents/MacOS/" append-path "" copy-vm ] 2tri
+     [ "Contents/MacOS/" append-path copy-vm ] 2tri
      dup OCT: 755 set-file-permissions ;
  
  : deploy.app-image ( vocab bundle-name -- str )