Merge branch 'master' into bluebox-production-org
Merge branch 'master' into bluebox-production-org
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
Bump travis-build.

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

Conflicts:
	Gemfile.lock
Merge branch 'bluebox-production-org' into bluebox-production-com