Uploading to s3
Merge branch 'develop' of github.com:marchibbins/bootstrap-tenants into develop

Conflicts:
	requirements.txt