Update zshrc
Update gitconfig for linux
Merge branch 'master' of github.com:twealm/dotfiles