Merge branch 'master' into bluebox-production-org
bump travis-build
Merge branch 'master' into bluebox-production-org
Bump travis-worker as to easily redeploy the worker
Merge branch 'master' into bluebox-production-org
Update Travis CI badge to only display results from master
Merge pull request #84 from Joshua-Anderson/travis-badge

Update Travis CI badge to only display results from master
Merge branch 'master' of github.com:travis-ci/travis-worker
update travis-build
Merge branch 'master' into bluebox-production-org
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 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
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
add a sleep when trying to destroy a vm