Ipdates zshrc and gitconfig
Add Tmux.conf
Merge branch 'master' of github.com:diazruy/dotfiles

Conflicts:
  gitconfig
  zshrc