Add brew path in front of $PATH.
Merge remote-tracking branch 'origin/master'

Conflicts:
	Library/Preferences/com.googlecode.iterm2.plist