Merge pull request #277 from opscode/shain/update_lock

Update to pull in updated omnibus commits