Merge: tweaked .deploy.yml and .travis.yml for new staging branch workflow