On branch titan

Changes to be committed:
	new file:   tmux/tmux-osx.conf
	modified:   tmux/tmux.conf
	modified:   zsh/zshrc