fix tmux with zsh
Merge branch 'master' of https://github.com/Camme/.configs

Conflicts:
	.tmux.conf
added ag to vim