Business logic change: shift should not need to have an organization.
deploy script cleanup
Merge branch 'stage' into stage2