tweaked .deploy.yml and .travis.yml for new staging branch workflow
fixed deploy task
Merge branch 'staging'