Update cacerts.rb
Merge remote-tracking branch 'upstream/master'

* upstream/master: (128 commits)
  Add dep-selector-libgecode software definition and make it a dependency of berkshelf.
  Remove always_build from berkshelf since it's not pointing to git for berkshelf-api anymore.
  Set the build version while building an MSI correctly.
  Upgrade appbundler to 0.2.0 for windows enhancements
  Remove unused local variable
  Fix PATH vs. Path issues for chefdk and chef-vault
  Fix Path vs. PATH environment variable settings for windows
  Ensure that logrotate actually installs
  Require ruby-windows before bundler on windows
  Add relx and up default_version of rebar to 2.2.0
  The official remote for rebar is now rebar, not basho
  Add missing 'env' variable
  Fix chefdk windows build issues
  Make the hack to set the build version slightly better.
  Add sqitch and perl_pg_driver
  Bump kitchen-vagrant to 0.15.0 to include fix for kitchen-vagrant#70
  Include kitchen-vagrant in default package
  annnnd the gem built isnt in pkg/
  typo, slashes and spaces are similar on my keyboard?
  laziness is a virtue unless copy/pasta
  ...

Conflicts:
	config/software/cacerts.rb
adding sensu to available software
Merge remote-tracking branch 'origin'

* origin:
  updated openssl no docs patch
  Update openssl.rb
  Update perl.rb
  Update perl.rb
  Update cacerts.rb
  Update to include non-default versions of software definitions.
  bump nokogiri version
  curl: remove the src/tool_hugehelp.c
  Update chef and chefdk not to always_build anymore thanks to new build_version DSL.
  update jre to 7u55-b13