Ported Matt's patches from chef repo

Version bump
Use chef_gem instead of old hacky way
Some other improvements