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