Quick hack to fix zsh.
Pull up tmux fix from trunk.
Merge branch 'joyent/feature/miscfix/2012Q4' into joyent/release/2012Q4
Update 'joyent' submodule