updated tmux mostly
updated tmux mostly
updates
Merge branch 'osx_detune' of github.com:coledot/dotfiles into osx_detune

Conflicts:
	.tmux.conf
keep shit updated
started using fish
updates