Laravel Path
Merge branch 'master' of https://github.com/evilmeteor/dotfiles

Conflicts:
	zsh/zshrc