force bunny to <0.8.0 to match chef's requirement (w/o this, bundle fails)
move chef things to chef bc
merge from upstream
cleanup from merges
update to upstream Gemfile
force bunny < 0.8.0 to make chef gem dependencies happy for bundler
Merge remote-tracking branch 'crowbar/master'
fix cmdb_spec test asserts and underlying problems in saving the cmdb Run and Event objects
Merge pull request #327 from aabes/pull-req-master-33d5ba0a8e9efe8a6125d594de548d6c58812b59

CDMB progress - cmdb_chef to chef barclamp, cmdb test fixes [1/2]