Tmux status on the bottom.
Merge branch 'master' of github.com:ProtractorNinja/dotfiles

Conflicts:
	link/.tmux.conf