New templates

Support for more TLDs and registrar servers
Merge remote-tracking branch 'origin/new_templates'