Updated tmux to work nicer on laptop
Merge branch 'master' of ssh://github.com/Darkwater124/dotfiles

Conflicts:
	tmuxstatus