Merge in https://github.com/2bits/homebrew