Merge branch 'master' into bluebox-production-org
Merge branch 'master' into bluebox-production-org
Merge branch 'master' into bluebox-production-org
Merge branch 'master' into bluebox-production-org
Bump travis-build.

Includes fixes for addons, /etc/hosts and $TRAVIS_BUILD_DIR.
Merge branch 'staging' into bluebox-production-org

Conflicts:
	Gemfile.lock
Bump travis-build.

Includes a fix for the fix for patching in a local hostname.
Bump travis-build.

This reverts a commit that tried to be nicer to addons as lists.
Bump travis-build.

Includes a fix for the fix for patching in a local hostname.
Bump travis-build.

This reverts a commit that tried to be nicer to addons as lists.
bump worker so new images are used
bump to pick up new images
bump the worker so chef restarts it and picks up the new images
Bump travis-build.

Includes coverity scan addon.
be a bit smarter when processing template info
bundle update to pick up changes in travis-build
as well as various gem updates
lock to an earlier release of travis-support
the newer version has a bug where active_record is required even when it isn't needed
Bump travis-build.

Includes revamp of coverity_scan plugin.
Bump travis-build. Include minor fix for coverity integration.
add a sleep when trying to destroy a vm