Edit load order
Merge branch 'master' of github.com:mayth/dotfiles

Conflicts:
	_zshrc