api conf file changes
Merge branch 'master' of github.com:pnthosting/chef-repo