Update gems to pull in latest omnibus-sofware to fix Heartbleed

In addition to updating omnibus-software, also updated
  mixlib-shellout to 1.4.0 from 1.3.0
  ohai to 6.22.0 to 6.20.0
Merge branch 'mm/master-update-CVE-2014-0160'