Screenlike tmux configuration
Add local zshrc to zshrc and exclude locals
Merge branch 'master' of github.com:rawland/dotfiles

Conflicts:
	zsh/zshrc