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
Merge remote-tracking branch 'upstream/master'

Conflicts:
	Puppetfile.lock