Tmux and vimrc changes
Merge remote-tracking branch 'remotes/origin/master'

Conflicts:
	.tmux.conf
Merge branch 'master' of https://github.com/pilf/vim-files

Conflicts:
	vimfiles/vimfiles