add tmux conf
Merge branch 'master' of https://github.com/jkahne/dotfiles

Conflicts:
	tmux/tmux.conf.symlink