merge in changes from mxcl/homebrew