Updated tmux settings
Merge branch 'master' of https://github.com/sanp/dotfiles

Conflicts:
	vim_mru_files