Concatenate $PATH, add MAMP directory

Conflicts:
	shell/config