Slowly combine the contact and team pages

i2p2www/pages/site/contact.html

@@ -75,11 +75,6 @@ GPG Key fingerprint: <tt>EA27 06D6 14F5 28DB 764B  F47E CFCD C461 75E6 694A</tt>
   </li>
 </ul>
 
-<p>{% trans volunteer=site_url('get-involved') -%}
-We are a small group of people spread around several continents, working to
-advance different aspects of the project and discussing the design of the
-network.
-<a href="{{ volunteer }}">Get involved!</a>
 {%- endtrans %}</p>
 
 <table border="0">
@@ -101,7 +96,7 @@ network.
 </tr>
 <tr>
 	<td valign="top"><b>{{ _('Assistant PR manager') }}</b></td>
-	<td valign="top">Meeh, idk</td>
+	<td valign="top">idk</td>
 	<td valign="top"><i>{{ _('Public speaking, public relations assistance') }}</i></td>
 </tr>
 <tr>
@@ -111,7 +106,7 @@ network.
 </tr>
 <tr>
 	<td valign="top"><b>{{ _('Download mirrors admin') }}</b></td>
-	<td valign="top">Meeh, idk</td>
+	<td valign="top">IDK, Meeh</td>
 	<td valign="top"><i>{{ _('manage the mirrors for the download files') }}</i></td>
 </tr>
 <tr>
@@ -216,12 +211,12 @@ network.
 </tr>
 <tr>
 	<td valign="top"><b>Google Play admin</b></td>
-	<td valign="top">Meeh</td>
+	<td valign="top">idk, meeh</td>
 	<td valign="top"><i></i></td>
 </tr>
 <tr>
 	<td valign="top"><b>F-Droid admin</b></td>
-	<td valign="top">Meeh</td>
+	<td valign="top">idk</td>
 	<td valign="top"><i></i></td>
 </tr>
 <tr>
@@ -273,7 +268,7 @@ network.
 </tr>
 <tr>
     <td valign="top"><b>{{ _('Console') }}</b></td>
-	<td valign="top">{{ _('IDK and Sadie') }}</td>
+	<td valign="top">{{ _('idk, Sadie') }}</td>
     <td valign="top"><i>{{ _('Router console HTML/CSS design') }}</i></td>
 </tr>
 <tr>