support subdomains and multiple top level domains

Signed-off-by: Adam Stokes <adam.stokes@ubuntu.com>
push before next rel

Signed-off-by: Adam Stokes <adam.stokes@ubuntu.com>