add ctl_chef_shell, plus edits, includes, etc.