update CF & Chef for hipchat integration
Merge remote-tracking branch 'origin/master'