Update gpg settings as requested in #497
Merge branch 'jm/gpg' PR #567
s/Enterprise Chef/Chef Server
Merge pull request #571 from opscode/tc/chef-server-all-the-things

s/Enterprise Chef/Chef Server
HTML cleanup
update changelog
Merge pull request #435 from opscode/nls/html-fixes

HTML cleanup
Lock `cacerts` to `2014.08.20`

The latest version (2014.09.03) causes `berks install` commands to fail with:

  /opt/opscode/embedded/lib/ruby/1.9.1/net/http.rb:800:in `connect': SSL_connect returned=1 errno=0 state=SSLv3 read server certificate B: certificate verify failed (OpenSSL::SSL::SSLError)
Merge pull request #574 from opscode/schisamo/ssl-verify-fix

Lock `cacerts` to `2014.08.20`
Add Chef 12 config for Chef 12 behavior (license, etc.)
Update changelog
Merge pull request #560 from opscode/of/add-chef-12-config-to-12

Aligns oc_erchef return values.
Changes to default ubuntu distribution to lucid when distro not found
Update changelog
Merge branch 'dt/ubuntu-14-support'
set version environment variable on oc-id db migrate
changelog update for oc_id
Merge pull request #541 from opscode/nls/version-oc-id-migrate-fix

rake db:migrate can be confused by VERSION environment variable
Add a missing space in the orgs-list ctl command description
Merge branch 'mm/fix-typo'