update travis-build
Bump travis-build
Update travis-build

Pulls in deployment updates to fix syntax errors when there are no
conditions on deploy.
Update travis-build
update travis-build
Merge branch 'master' into staging