Adjust path
Remove dir_colors
Merge branch 'master' of github.com:pheew/dotfiles

Conflicts:
	.zshrc