Update my tmux configuration.
Better tmux + vim integration.
Merge branch 'master' of github.com:CapnKernul/dotfiles

Conflicts:
	config/vimrc