Revert "update travis-build"

This reverts commit b22f9bcfd6102f1bde480eb72cacf5154ad160e3.
Merge branch 'master' into bluebox-production-com