Enabled autojump.
Merge branch 'master' of ssh://github.com/SumiTomohiko/dotfiles

Conflicts:
	dot.zshrc