Add autojump in zsh
Substitue gitconfig
Merge branch 'master' of github.com:ifyouseewendy/dotfiles-1

Conflicts:
	zshrc