merged most stuff according to https://github.com/ssgelm/puppet-homebrew/compare/boxen:master...master