Broken logic fix
Merge pull request #19 from word/master

Broken logic fix
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
Added zabbixapi gem
Merge remote-tracking branch 'upstream/master'

Conflicts:
	puppet.rb
Merge pull request #22 from word/master

Added zabbixapi gem
Bumped up zcollective version
Merge pull request #23 from word/master

Bumped up zcollective version