Slightly rework amazon bucket subdomain manipulation. Fixes #19