Fix tmux
Merge branch 'master' of https://github.com/clynamen/dotfiles

Conflicts:
	vim/vimrc.symlink
Fix history completion