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.
Merge branch 'staging' into bluebox-production-com