Update team page

- Move/remove people not working on Qubes OS anymore.
- Move Omeg back to the core team.
- Comment out User research contact, as there is no active user research
  right now (and that address is inactive).

Author: marmarek

_data/team.yml

@@ -12,11 +12,11 @@
   email: [email protected]
   fingerprint:
 
-- name: User research
-  icon: fa-flask
-  type: inquiries
-  email: [email protected]
-  fingerprint: 4D2E B2FA E2BE 5E8F D785  2DE0 DE1B 6337 FF6C 36F1
+#- name: User research
+#  icon: fa-flask
+#  type: inquiries
+#  email: [email protected]
+#  fingerprint: 4D2E B2FA E2BE 5E8F D785  2DE0 DE1B 6337 FF6C 36F1
 
 # Core
 
@@ -28,14 +28,6 @@
   fingerprint: 86BA 6E93 318F BA44 6642  A90A DB8F D31C CAD7 D72C
   github: marmarek
 
-- name: Wojtek Porczyk
-  role: "Python, Linux, and infrastructure"
-  type: core
-  picture: team-woju.jpg
-  email: [email protected]
-  fingerprint: 68ED 1515 FA6B D2D1 05EA  1624 BF6B D932 103A 2351
-  github: woju
-
 - name: Michael Carbone
   role: "Project management and funding"
   type: core
@@ -96,22 +88,6 @@
   fingerprint: 6B52 7FE5 6308 5B7A 34B9  6C2F 8F90 3F3E 5662 199B
   github: MiCh
 
-- name: Nina Eleanor Alter
-  email: [email protected]
-  role: "Design and user research"
-  type: core
-  picture: team-nina.jpg
-  fingerprint: C9D8 795D DFD1 7343 A66B  C406 8207 64BD 962D 8BBA
-  github: ninavizz
-
-- name: Demi Marie Obenour
-  email: [email protected]
-  role: "Software developer: Rust, Python, package management, GUI, and storage"
-  type: core
-  picture: team-demi.jpg
-  fingerprint: 7687 4D9F 1336 BA22 5907  1C71 B288 B55F FF9C 22C1
-  github: DemiMarie
-
 - name: Solène Rapenne
   email: [email protected]
   role: "Documentation maintainer"
@@ -126,6 +102,13 @@
   fingerprint: 2E36 3FF6 0A81 92F5 F3EC  867E 8FB4 D514 D770 E6E1
   github: maiska
 
+- name: Rafał Wojdyła
+  role: "Main developer of Qubes Windows tools"
+  type: core
+  email: [email protected]
+  fingerprint: 3AC8 7FA3 04E4 59D0 DF08  21A1 045A 1328 4C85 173A
+  github: omeg
+
 # Emeritus
 
 - name: Joanna Rutkowska
@@ -147,12 +130,13 @@
   type: emeritus
   email: [email protected]
 
-- name: Rafał Wojdyła
-  role: "Main developer of Qubes Windows tools"
+- name: Wojtek Porczyk
+  role: "Python, Linux, and infrastructure"
   type: emeritus
-  email: [email protected]
-  fingerprint: 3AC8 7FA3 04E4 59D0 DF08  21A1 045A 1328 4C85 173A
-  github: omeg
+  picture: team-woju.jpg
+  email: [email protected]
+  fingerprint: 68ED 1515 FA6B D2D1 05EA  1624 BF6B D932 103A 2351
+  github: woju
 
 # Community
 
@@ -332,3 +316,11 @@
   role: "HCL page maintenance, HCL scripts"
   type: community
   fingerprint: 9AF3 388A 533E 73AD 1107  7E55 617D 7048 8F0E 7BC6
+
+- name: Demi Marie Obenour
+  email: [email protected]
+  role: "Software developer: Rust, Python, package management, GUI, and storage"
+  type: community
+  picture: team-demi.jpg
+  fingerprint: A294 2DA9 5256 D5A7 AEA3  DFEC B336 873A B329 F253
+  github: DemiMarie