less suck with tmux (hey, that rhymes!)
Merge branch 'master' of https://github.com/jdwelch/dotfiles

Conflicts:
	tmux/tmux.conf.symlink