Clean up sponsors a bit

Author: dwfreed

sponsors.json

@@ -1,77 +1,67 @@
 {
-  "sponsors":
-  {
-    "caker":
-    {
-      "name": "Christopher Aker",
-      "nick": "caker",
-      "roles": { "sponsor": true }
+  "sponsors": {
+    "AS6453": {
+      "name": "AS6453",
+      "nick": "AS6453",
+      "roles": {
+        "sponsor": true
+      }
     },
-    "winjer":
-    {
-      "name": "Doug Winter",
-      "nick": "winjer",
-      "roles": { "sponsor": true }
+    "MIT CSAIL": {
+      "name": "MIT CSAIL",
+      "nick": "MIT CSAIL",
+      "roles": {
+        "sponsor": true
+      }
+    },
+    "OSUOSL": {
+      "name": "OSUOSL",
+      "nick": "OSUOSL",
+      "roles": {
+        "sponsor": true
+      }
     },
-    "urandom":
-    {
-      "name": "Eric Evans",
-      "nick": "urandom",
-      "roles": { "sponsor": true }
+    "RCS&RDS": {
+      "name": "RCS&RDS",
+      "nick": "RCS&RDS",
+      "roles": {
+        "sponsor": true
+      }
     },
-    "ziga":
-    {
-      "name": "Frederic Deletang",
-      "nick": "ziga",
-      "roles": { "sponsor": true }
+    "Swepipe": {
+      "name": "Swepipe",
+      "nick": "Swepipe",
+      "roles": {
+        "sponsor": true
+      }
     },
-    "Joy":
-    {
-      "name": "Josip Rodin",
-      "nick": "Joy",
-      "roles": { "sponsor": true }
+    "TiMOiD": {
+      "name": "Tim Warnock",
+      "nick": "TiMOiD",
+      "roles": {
+        "sponsor": true
+      }
     },
-    "luca":
-    {
+    "luca": {
       "name": "Luca Filipozzi",
       "nick": "luca",
-      "roles": { "sponsor": true }
+      "roles": {
+        "sponsor": true
+      }
     },
-    "maswan":
-    {
+    "maswan": {
       "name": "Mattias Wadenstein",
       "nick": "maswan",
-      "roles": { "sponsor": true }
-    },
-    "bugblue":
-    {
-      "name": "Mendel Mobach",
-      "nick": "bugblue",
-      "roles": { "sponsor": true }
-    },
-    "miro":
-    {
-      "name": "Michael Römer",
-      "nick": "miro",
-      "roles": { "sponsor": true }
+      "roles": {
+        "sponsor": true
+      }
     },
-    "robster":
-    {
-      "name": "Rob Bradford",
-      "nick": "robster",
-      "roles": { "sponsor": true }
-    },
-    "TiMOiD":
-    {
-      "name": "Tim",
-      "nick": "TiMOiD",
-      "roles": { "sponsor": true }
-    },
-    "dsx":
-    {
-      "name": "dsx",
-      "nick": "dsx",
-      "roles": { "sponsor": true }
+    "winjer": {
+      "name": "Doug Winter",
+      "nick": "winjer",
+      "roles": {
+        "sponsor": true
+      }
     }
   }
 }

staff.json

@@ -12,8 +12,7 @@
       "name": "Matt London",
       "nick": "Matt",
       "roles": {
-        "netop": true,
-        "sponsor": true
+        "netop": true
       }
     },
     "Myon": {
@@ -34,8 +33,7 @@
       "name": "Anthony Velardi",
       "nick": "avelardi",
       "roles": {
-        "netop": true,
-        "sponsor": true
+        "netop": true
       }
     },
     "cwningen": {
@@ -73,15 +71,15 @@
       "name": "Rico Gloeckner",
       "nick": "mc",
       "roles": {
-        "netop": true,
-        "sponsor": true
+        "netop": true
       }
     },
     "mcintosh": {
       "name": "Richie McIntosh",
       "nick": "mcintosh",
       "roles": {
-        "netop": true
+        "netop": true,
+        "sponsor": true
       }
     },
     "pastly": {

staff.md

@@ -128,21 +128,13 @@ Please note that we cannot guarantee that any specific server will be accessible
 at any specific time. Always use irc.oftc.net to connect, or irc6.oftc.net if
 you are using ipv6. This will take you to an active server.
 
- * Andre Guibert de Bruet (andy) (oxygen - Ann Arbor, MI, US)
- * Mendel Mobach (BugBlue) (galapagos - The Netherlands)
  * Joerg Jaspert (Ganneff) (reticulum - Berlin, DE)
- * Anton Lundin (glance) (solenoid - Umeå, Sweden)
  * Luca Filipozzi (luca) (graviton - Vancouver, BC, CA)
  * Mattias Wadenstein (maswan) (solenoid - Umeå, Sweden)
- * Rico Gloeckner (mc) (venus - Nuremberg, DE)
- * Rob Bradford (robster) (charon - London, United Kingdom)
- * Eric Evans (urandom) (osmotic - Grapevine, TX, USA)
  * Doug Winter (winjer) (kinetic - Brighton, UK)
- * Martin-Zobel Helas (zobel) (magnet - Darmstadt, DE)
  * AS6453 (reflection - Montréal, Quebec, CA)
  * [mythic beasts](https://www.mythic-beasts.com/) (charon - London, UK)
- * [Linode](http://www.linode.com/), Christopher S. Aker (caker)
-(strange, weber, resistance - Fremont, CA, US)
+ * [Linode](http://www.linode.com/)(strange, weber, resistance - Fremont, CA, US)
  * [OSUOSL](http://osuosl.org/) (larich - Corvalis, OR, US)
  * [RCS&RDS](https://www.digiromania.ro) (getic - Pitești, RO)