upload files to s3 if s3 config is set
Merge branch 'refs/heads/s3'

Conflicts:
	package.json
add s3 env vars to settings
ignore ds stores