Update travis-build

Pulls in deployment updates to fix syntax errors when there are no
conditions on deploy.
Merge branch 'master' into bluebox-production-com