name fixes
doing all the S3 stuff
Merge branch 'uk' into us

Conflicts:
	package.json
skip testing