moving 'git diff' to use vimdiff instead
Made some changes to .zshrc
Merge branch 'master' of https://github.com/socketwiz/dotfiles