Use Mailchimp instead of Google Groups, etc

docs/manage/tpl/manage.html

@@ -79,14 +79,9 @@ <h3>Your Servers
 
 	<p>
 	To change other server information, email <a
-	href="mailto:ntppool-server-support@develooper.com">ntppool-server-support@develooper.com</a>.
+	href="mailto:server-owner-help@ntppool.org">server-owner-help@ntppool.org</a>.
 	</p>
 
         </div>
 
 </div>
-
-
-
-
-

docs/manage/tpl/vendor/approved_email.txt

@@ -1,6 +1,6 @@
-[%- page.style='bare.html' %]From: (Ask Bjoern Hansen) ntppool-vendors@develooper.com
+[%- page.style='bare.html' %]From: (Ask Bjoern Hansen) vendors@ntppool.org
 To: ([% vz.user.username %]) [% vz.user.email %]
-Bcc: ask@develooper.com
+Bcc: ask@ntppool.org
 Subject: Vendor zone activated: [% vz.zone_name %]
 
 Hi [% vz.user.name %],
@@ -12,11 +12,10 @@ hostnames are below.  They will be active within a few hours.
    [% i %].[% vz.zone_name %].pool.ntp.org
 [% END %]
 
-
-Please subscribe to the (announce-only, very low traffic)
-ntppool-vendors list at Google Groups.  We recommend everyone in your
-organization involved with this is subscribed there.
-   http://groups.google.com/group/ntppool-vendors
+Please subscribe to the (announce-only, very low traffic - typically a
+few mails a year or less) vendor information mailing list. We
+recommend everyone in your organization involved with project are
+subscribed: http://eepurl.com/PN-3f
 
 If you are a commercial organization/product/company consider
 contributing back to the pool so we can keep the service sustainable
@@ -30,5 +29,5 @@ to offer this service to you.
 
 Kind regards,
 
-Ask Bjoern Hansen
-(ask@develooper.com)
+Ask Bjørn Hansen
+(ask@ntppool.org)

docs/manage/tpl/vendor/form.html

@@ -9,7 +9,7 @@
 	[% IF errors and errors.zone_name %]
 	<div class="error">
 	  [%  errors.zone_name | html  %]<br/>
-	  <small>Contact <a href="ntppool-vendors@develooper.com">ntppool-vendors@develooper.com</a> for help.</small>
+	  <small>Contact <a href="vendors@ntppool.org">vendors@ntppool.org</a> for help.</small>
 	</div>
 	[% END %]
 	<input type="text" class="text" name="zone_name" value="[% vz.zone_name | html %]" id="name" size="18" maxsize="50">
@@ -57,4 +57,4 @@
 	<p><input type="submit" class="button" value="Save application &rarr;"></p>
 	</fieldset>
 	</form>
-</div>
+</div>

docs/manage/tpl/vendor/submit_email.txt

@@ -1,11 +1,13 @@
-[%- page.style='bare.html' %]To: ntppool-vendors@develooper.com
+[%- page.style='bare.html' %]To: vendors@rt.ntppool.org
 From: ([% combust.user.username %]) [% combust.user.email %]
 Subject: New vendor zone application: [% vz.zone_name %]
 
 [% combust.user.username %] requested the "[% vz.zone_name %]" zone for [% vz.organization_name %].
 
 [% combust.manage_url('/manage/vendor/zone', id = vz.id) %]
 
+Clients: [% vz.device_count %]
+
 Notes:
 
 [% vz.request_information %]

docs/manage/tpl/vendor/submitted.html

@@ -9,7 +9,7 @@ <h3>Vendor Zone Application Submitted</h3>
 </p>
 
 <p>
-If you don't hear back within 3 days, contact ntppool-vendors@develooper.com.
+If you don't hear back within a week, please contact vendors@ntppool.org.
 </p>
 
 <p>