Add /usr/local/bin to the PATH in fish
Merge remote-tracking branch 'origin/master'

Conflicts:
	config.fish
Merge remote-tracking branch 'origin/master'