Merge branch 'master' of github.com:boxen/puppet-homebrew into symlink

Conflicts:
	manifests/formula.pp