Fix bad code causing errors
Fix bad code causing errors

It appears a merge conflict wasn't properly cleaned up in
1fbb3e97c66ba413e0fa294a5f56d1079eea957e and causes issues when calling knife.
This should fix the problem.

Signed-off-by: Lance Albertson <3161cdc7bf197e4c3a35b9cbe358c79910f27e90@osuosl.org>

Nordstrom/chef-vault,chef/chef-vault,chef/chef-vault