fix tmux local file bug
Merge branch 'master' of github.com:MEHColeman/dotfiles

Conflicts:
	tmux.conf