fixes
tmux & zsh fixes
Merge branch 'master' of https://github.com/m0g/dotfiles
Merge branch 'master' of https://github.com/m0g/dotfiles

Conflicts:
	.vimrc