Update tmux.conf
Merge branch 'master' of github.com:ejima/dotfiles
Update vimrc
Update zshrc
Update setup.sh
Merge branch 'master' of github.com:ejima/dotfiles

Conflicts:
	setup.sh