bundle install in the build, so we don't use bundle in the tests
exclude server gems for chef-10 builds
adding docgen
Merge pull request #58 from opscode/lcg/unbundle-rspec-tests

bundle install in the build, so we don't use bundle in the tests
set Omnibus cache build path for `pip install` commands

By default pip uses "<OS temp dir>/pip-build-<username>", which can 
cause failures on long-lived build slaves.
Merge branch 'pip-install-build-dir'
do a bundle install before gem install, otherwise the gem
  install may install versions of gems that do not match the
  bundle and we want to preserve exactly the bundle contents
fix paths to use the omnibus stuff that we've installed
missing libgcc dep
Merge pull request #61 from opscode/lcg/bundle-install-b4-gem-install

do a bundle install before gem install, otherwise the gem
require modern gmake instead of removing parallellism
prefer gmake for openssl
Merge pull request #62 from opscode/lcg/openssl-make-j

Lcg/openssl make j
reference to removed build_jobs variable
Merge pull request #64 from opscode/lcg/build_jobs_fix

reference to removed build_jobs variable
Bump chef-gem to 11.6.0

(This enables lazy attributes)
Updated CA Certs bundle.  Note the version number did not change in the
file, so we just appended a -1 on the version.

From http://curl.haxx.se/ca/ :

August 4th, 2013 -
The cacert.pem output now only contains certificates that are explicity
marked as trusted. The script was updated in commit 51f0b798fa as a
response to the 1.84 revision update of certdata.txt from June 2012.
Merge branch 'new-cacerts-distro'
Merge branch 'cm/update_chef'
Merge remote-tracking branch 'upstream/master'

Conflicts:
	config/software/chef-gem.rb