Attempt to detect chef-server-core along with private-chef
Style improvements thanks to jmink
Merge pull request #118 from opscode/irving/fix_cs12_convergence

Attempt to detect chef-server-core along with private-chef