add tmux and mackup
Merge branch 'macosx' of github.com:lrascao/dotfiles into macosx

Conflicts:
	bin/setup.data
zsh history settings