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 branch 'master' of https://github.com/boxen/our-boxen

# By Will Farrington (2) and others
# Via Will Farrington
* 'master' of https://github.com/boxen/our-boxen:
  Don't put our xcrun shim on path for 10.9
  Clean up inifile stuff from #362
  Updating Puppet modules
  We've moved the inifile module!

Conflicts:
	Puppetfile.lock
Added phantomjs to the project inspectall web app and to the puppet file.