Makes deploy handle the new staging env
Merge branch 'master' into staging