We've moved the inifile module!
Updating Puppet modules
Merge pull request #363 from createdbypete/update-puppetfile

Updating Puppet modules
Merge pull request #362 from apenney/inifile-change

We've moved the inifile module!
Clean up inifile stuff from #362
Don't put our xcrun shim on path for 10.9
Update Puppet modules with the latest available
Updating to ::boxen_user variable in anticipation of ::luser deprecation
Boxen gem now v1.5
Missed Homebrew module update to 1.4.1
Merge pull request #366 from createdbypete/update-puppetfile

Updating to latest available Puppet module versions
Merge remote-tracking branch 'upstream/master'

Conflicts:
	Puppetfile.lock