Update tmux.conf, make vim use tomorrow-night theme
Merge branch 'master' of github.com:russellhancox/dotfiles

Conflicts:
	vim/config/bundles.vim