This resolves many bugs and a CVE

Signed-off-by: Tim Smith <tsmith@chef.io>