Merge pull request #16 from word/master

Added bundler gem
Added fog and inifile gems

These are required for sf-ebs-snapshot, which will be part of
sf_aws
Merge pull request #17 from word/master

Included aws sub recpe and upgrade fix on centos
Added profile.d script to force the --write-catalog-summary option when using puppet apply
Merge pull request #19 from word/master

Broken logic fix
Removed profile.d workaround
Updated the omnibus.bin wrapper script to force the --write-catalog-summary option when using puppet apply
Updated install_files and install/uninstall hooks so that the omnibus.bin wrapper script is invoked
Create /var/lib/puppet/state directory as part of the install as it does not always get created on the first run of puppet apply
Merge pull request #18 from mikemead/master

Modified omnibus.bin wrapper script to force the --write-catalog-summary option when using puppet apply
Added librarian-puppet to the omnibus
Clean up debug output; zcollective to /usr/bin
Merge pull request #20 from mikesilky/master

Clean up debug output; zcollective to /usr/bin
Increased zcollective version
Bumped zcollective version to 0.0.11
Merge pull request #21 from mikesilky/master

Bumped zcollective version to 0.0.11
Merge remote-tracking branch 'upstream/master'

Conflicts:
	puppet.rb