Fix for variable scope in chef handler
Reorganize chef handler options
Merge branch 'chef-mods'