updates mac PATH to use /usr/local/bin (homebrew) rather than
/opt/local/bin (macports)
Merge branch 'master' of http://github.com/cromero/dotfiles

Conflicts:
	mac/dot_profile