more build options and better desktop.
Fix PLIST subst
Merge remote-tracking branch 'origin/master' into joyent