Merge pull request #27 from jbrunton/staging

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