tmux.conf
update .zshrc
remove .vim
Merge branch 'master' of github.com:stepinto/conf

Conflicts:
	.zshrc
.vimrc
update tmux.conf