fix gitignore & zshrc
Update zshrc
Merge branch 'master' of github.com:fainder/dotfiles