Merge branch 'master' of https://github.com/mxcl/homebrew

Conflicts:
	.gitignore