updated to latest dependencies
update ruby stuff
Merge pull request #633 from boxen/update-deps

Update Puppet and Ruby dependencies
Upgrade gcc package to 2.1.1

Fixes #637
update librarian-puppet
update Puppet dependencies
Merge pull request #639 from boxen/update-librarian-puppet-and-puppet-git

Update librarian puppet and puppet git
Rename `module-data` to `module_data`

This came up in rodjek/librarian-puppet#242. A `-` is not a valid
character in module names according to
http://docs.puppetlabs.com/puppet/latest/reference/modules_fundamentals.html#allowed-module-names
In the Modulefile for ripienaar/puppet-module-data, the name actually
contains an underscore.

Thanks @hanjianwei for noticing this and tracking down the naming rules
Merge pull request #640 from boxen/fix-module-data-name

Rename `module-data` to `module_data`
Upgrade puppetlabs-inifile to Release 1.1.1

This supported bugfix release corrects the inifile section header detection regex (so you can use more characters in your section titles).

More details: https://github.com/puppetlabs/puppetlabs-inifile/pull/115
Merge pull request #648 from johnsyweb/upgrade-inifile-1.1.1

Upgrade puppetlabs-inifile to Release 1.1.1
Merge branch 'master' of github.com:boxen/our-boxen

Conflicts:
	Gemfile
	Gemfile.lock
	Puppetfile
	Puppetfile.lock