Merge pull request #50 from opscode/sd/fix-meck-locking

Sd/fix meck locking
for CI build
update branch for tesitng