Merge lp:~knome/config/planet-ubuntu into lp:~planet-ubuntu/config/main

[Pasi Lallinaho]

* Create config_old.ini to hold (temporarily) removed feeds from:
  - People who aren't Ubuntu members
  - People who want their feed to be disabled for their hiatus
  - Sites that do not have content, or return a HTTP error
* Drop sites that clearly do not exist any more in any level
* Add sponsors to some team blogs
* Move some teams blogs to the team blogs listing
* Fix all nicks to point to existing Launchpad usernames
* Fix some feed URLs
* Improve the instructions

Updated on January 23, 2015 after (manually) rebasing against the current config.

[Daniel Holbach (dholbach)]

Reviewed until line 385 of the diff. Can anyone else have a look as well?

review: Needs Fixing

[Scott Ritchie (scottritchie)]

akgraner is being demoted by this diff, under the heading "not an ubuntu member", but she is. https://launchpad.net/~akgraner

review: Needs Fixing

[Pasi Lallinaho (knome)]

As I noted in the mail, the Launchpad API is not perfect, so manual reviewing is still needed.

Is there anything else to be changed? Did you review the rest of the file already?

I'll resubmit the proposal with that change if nothing appears in a few days.

[Daniel Holbach (dholbach)]

Pasi: do you think you could re-run the script the current config? O:-)

[Daniel Holbach (dholbach)]

Text conflict in config.ini
Conflict adding file heads/amjjawad.png. Moved existing file to heads/amjjawad.png.moved.
Conflict adding file heads/carla-sella.png. Moved existing file to heads/carla-sella.png.moved.
Conflict adding file heads/mbruzek.png. Moved existing file to heads/mbruzek.png.moved.
Conflict adding file heads/paulw2u.png. Moved existing file to heads/paulw2u.png.moved.
Path conflict: heads/rpadovani.png / <deleted>
Conflict adding file heads/sgclark.png. Moved existing file to heads/sgclark.png.moved.
Conflict adding file heads/snwh.png. Moved existing file to heads/snwh.png.moved.
Conflict adding file heads/teward.png. Moved existing file to heads/teward.png.moved.
Conflict adding file heads/uflogo.png. Moved existing file to heads/uflogo.png.moved.
Conflict adding file heads/wxl.png. Moved existing file to heads/wxl.png.moved.

[lp:~knome/config/planet-ubuntu]

1737. By Pasi Lallinaho on 2015-01-23

Resolve conficts.

Unmerged revisions

=== modified file 'config.ini'
--- config.ini	2015-01-11 13:03:20 +0000
+++ config.ini	2015-01-23 16:34:19 +0000
@@ -21,40 +21,29 @@
 # NOTE: Please be sure to read: https://wiki.ubuntu.com/PlanetUbuntu for
 #       any problems you may have with your URLs.
 #
-# Please add your entry below:
-#
-# The ini file has been divided up into sections, please place your blog into the right secition
-# Corporate blogs: Company blogs/feeds which have been approved by the CC
-# Team blogs: These are typically feeds from projects/teams within Ubuntu and derivatives e.g. fridge, podcast
-# Individual blogs: Blog feeds from individual Ubuntu/Kubuntu/Edubuntu/Xubuntu/MOTU/etc members
+# The ini file has been divided up into sections, please place your blog into the right section
+#   Corporate blogs:  Company blogs/feeds which have been approved by the CC
+#   Team blogs:       These are typically feeds from projects/teams within Ubuntu and derivatives e.g. fridge, podcast
+#   Individual blogs: Blog feeds from individual Ubuntu/Kubuntu/Edubuntu/Xubuntu/MOTU/etc members
+#
+# REMEMBER: Please put your launchpad ID in the nick field, not your IRC nickname
+#
 
 ### Corporate blogs
 
-# Yannh: Commenting this out, I was the only Ubuntu member and
-# have now left.
-#[http://blogs.thehumanjourney.net/oaubuntu/feed/entries/rss]
-#name = Oxford Archaeology
-#face = oxfordarchaeology.png
-#nick = oxfordarchaeology
-
-#[http://en.community.dell.com/blogs/direct2dell/rss.aspx?Tags=Linux]
-#name = Dell Linux Engineering Team
-#face = dell.png
-#nick = dell
-
 [http://blog.canonical.com/tag/planetubuntu/feed/]
 name = Canonical
 face = canonical.png
 nick = dholbach
 
+
 ### Team blogs
 ## Each should have a nick =  line with a sponsoring Ubuntu Member (other people may post to the team blog)
 
 [http://ubottu.com/ircc/?feed=atom]
 name = IRC Council
 face = irccteam.png
-nick = AlanBell
-
+nick = alanbell
 
 [http://ubuntuaccessibility.wordpress.com/feed/atom]
 name = Accessibility Team
@@ -64,10 +53,12 @@
 [http://www.kubuntu.org/news/feed/atom]
 name = Kubuntu
 face = kubuntu.png
+nick = jr
 
 [http://edubuntu.org/rss.xml]
 name = Edubuntu
 face = edubuntu.png
+nick = stgraber
 
 [http://www.xubuntu.org/feed/]
 name = Xubuntu
@@ -78,29 +69,10 @@
 name = Ubuntu NGO Team
 nick = czajkowski
 
-[http://screencasts.ubuntu.com/rss.xml]
-name = Ubuntu Screencasts
-nick = popey
-#Added by Alan Pope
-
-[http://upstart.at/feed/]
-name = Upstart Development Blog
-nick = upstart
-face = upstart.png
-
 [http://blog.qa.ubuntu.com/rss.xml]
 name = Ubuntu QA blog
 face = ubuntu-qa.png
-nick = ubuntuqa
-
-[http://debaday.debian.net/feed/?cat=4]
-name = Debian Package of the Day
-nick = debaday
-
-[http://www.mythbuntu.org/home/news/posts.xml]
-name = Mythbuntu
-nick = tgm4883
-face = mythbuntu.png
+nick = nskaggs
 
 [http://podcast.ubuntu-uk.org/feed/]
 name = Ubuntu Podcast from the UK LoCo
@@ -127,21 +99,14 @@
 face = ubuntu-women.png
 nick = lyz
 
-# Updated cRT#45832
-[http://blog.bazaar.canonical.com/rss.xml]
-name = Bazaar
-nick = bzr
-face = bzr.png
-
 [http://ubuntu-slovenija.blogspot.com/feeds/posts/default/-/ubuntu-planet]
 name = Slovenian translation team
 face = andrej.znidarsic.png
-nick = slovenian translation team
+nick = andrej.znidarsic
 
 [http://voices.canonical.com/kernelteam/?feed=rss2]
 name = Ubuntu Kernel Team
-#face = kernelteam.png
-nick = kernelteam
+nick = leannogasawara
 
 [http://lococouncil.ubuntu.com/feed/?mrss=off]
 name = Ubuntu LoCo Council
@@ -161,30 +126,71 @@
 [http://news.launchpad.net/feed]
 name = Launchpad News
 face = launchpad-heading.png
-
-# [http://ohio.ubuntu-us.org/burningcircle/feed]
-# name = Ubuntu Ohio - Burning Circle
-# nick = skellat
-## Added by Stephen Michael Kellat
-# Stephen Michael Kellat on 2013-12-21: The Burning Circle is on hiatus until further notice and it may be a while
-
-[http://www.doadjustyourset.com/feed]
-name = Ubuntu TV
-nick = tgm4883
+# NOTE: Needs a sponsor
 
 [http://ubuntugnome.org/feed/?mrss=off]
 name = Ubuntu GNOME
 nick = jbicha
 face = ubuntu-gnome.png
+# NOTE: Needs a sponsor who is a Ubuntu member
 
 [http://ubuntuscientists.wordpress.com/feed/]
 name = Ubuntu Scientists
 nick = belkinsa
 
+[http://cloud.ubuntu.com/tag/planet/feed/]
+name = Ubuntu Cloud Portal
+face = cloudportal.png
+nick = jorge
+
+[http://ubuntustudio.org/category/planetubuntu/feed/]
+name = Ubuntu Studio
+face = ubuntustudio.png
+# NOTE: Needs a sponsor
+
+[http://wire.kubuntu.org/?feed=rss2]
+name = Kubuntu Wire
+face = kubuntu-wire.png
+# NOTE: Needs a sponsor
+
+[http://developer.ubuntu.com/en/blog/feeds/tags/planet-ubuntu/]
+name = Ubuntu App Developer Blog
+face = ubuntuappdevelopers.png
+nick = dpm
+
+[http://release-blog.ubuntu.com/?feed=rss2]
+name = Ubuntu Release blog
+nick = dholbach
+
+[http://www.ubuntuserver.org/?feed=atom]
+name = Ubuntu Server blog
+nick = robbiew
+
+[http://behindthecircle.org/feed/atom]
+name = Behind the Circle
+nick = sikon
+
+[https://sites.google.com/a/mythbuntu.org/website/home/news/posts.xml]
+name = Mythbuntu
+nick = tgm4883
+face = mythbuntu.png
+
+[http://blog.bazaar.canonical.com/?feed=rss2]
+name = Bazaar
+nick = bzr
+face = bzr.png
+
+[http://ubuntuforumsorg.wordpress.com/category/ubuntu/feed/?mrss=off]
+name = Forums Council
+face = uflogo.png
+nick = elfy
+
 [http://linuxpadawan.net/blog/feed/]
 name = Linux Padawan
 nick = belkinsa
 
+ 
+
 ### Individual blogs
 
 [http://ubuntusense.com/feed/rss/]
@@ -196,93 +202,45 @@
 face = davmor2.png
 nick = davmor2
 
-[http://valueerror.wordpress.com/category/planet-ubuntu/feed/atom/]
-name = Andrea Corbellini
-#face = yourusername.png
-nick = andrea.corbellini
-
 [http://leogg.wordpress.com/category/planet-ubuntu/feed/atom]
 name = Leandro Gómez
 face = leogg.png
 nick = leogg
 
-[http://nxvl.blogspot.com/feeds/posts/default/-/en]
-name = Nicolas Valcárcel
-face = nxvl.png
-nick = nvalcarcel
-
-[http://cody.zapto.org/?feed=rss2]
-name = Cody A.W. Somerville
-# face = yourusername.png
-nick = cody-somerville
-
 [http://www.fabianrodriguez.com/blog/category/tech/linux/ubuntu/ubuntu-planet/feed]
 name = Fabián Rodríguez
 face = magicfab.png
 nick = magicfab
 
-# Found to no longer be a member as of 2013-03-25
-#[http://www.netsplit.com/feed/atom]
-#name = Scott James Remnant
-#face = keybuk.png
-#nick = scott
-
-[http://haecceity.clearairturbulence.org/xml/atom/category/tech/feed.xml]
-name = Thom May
-face = thom.png
-nick = thombot
-
 [http://mako.cc/copyrighteous/?flav=rss]
 name = Benjamin Mako Hill
 face = mako.png
 nick = mako
 
-[http://blog.digital-scurf.org/?flav=atom&planet=ubuntu]
-name = Daniel Silverstone
-face = kinnison.png
-nick = dsilvers
-
-[http://blogs.gnome.org/syndicate/seb128/]
-name = Sebastien Bacher
-face = seb128.png
-nick = seb128
-
 [http://benjaminkerensa.com/category/open-source/feed/]
 name = Benjamin Kerensa
 face = bkerensa.png
 nick = bkerensa
 
-[http://raw.no/personal/blog/tech/?flav=rss]
-name = Tollef Fog Heen
-face = mithrandir.png
-nick = tfheen
-
 [http://advogato.org/person/robertc/rss.xml]
 name = Robert Collins
-#face = lifeless.png
 nick = lifeless
 
-# Error 500
-#[http://carlos.pemas.net/blog?flav=rss]
-#name = Carlos Perelló Marín
-#face = carlos.png
-#nick = carlos
-
 [http://blogs.kde.org/blog/57/feed]
 name = Jonathan Riddell
 face = jriddell.png
 nick = jr
 
+[http://werghdf.blogspot.co.uk/feeds/posts/default]
+name = Jonathan Riddell
+face = jriddell.png
+nick = jr
+
 [http://jriddell.org/feed/?tag=planetubuntu]
 name = Jonathan Riddell
 face = jriddell.png
 nick = jr
 
-[http://werghdf.blogspot.co.uk/feeds/posts/default]
-name = Jonathan Riddell
-face = jriddell.png
-nick = jr
-
 [http://ograblog.wordpress.com/feed/atom]
 name = Oliver Grawert
 face = ogra.png
@@ -293,42 +251,15 @@
 face = dholbach.png
 nick = dholbach
 
-# Error 404
-#[http://smarterits.com/~brandon/log/wp-rss2.php]
-#name = Brandon Hale
-#face = tseng.png
-#nick = tseng
-
 [http://www.advogato.org/person/Burgundavia/rss.xml]
 name = Corey Burger
 face = burgundavia.png
 nick = corey.burger
 
-# 404
-#[http://www.larvalstage.net/index.php?/feeds/categories/4-ubuntu.rss]
-#name = Jerry Haltom
-##face = wasabi.png
-#nick = wasabi
-
 [http://www.sourceguru.net/tag/ubuntu/feed/]
 name = Martin Meredith
 face = mez.png
-nick = Mez
-
-[http://engage.wordpress.com/tag/ubuntu/feed/atom]
-name = Jerome S. Gotangco
-face = jsgotangco.png
-nick = jgotangco
-
-#[http://www.nafallo.info/blog/labels/ubuntu.en]
-name = Christian Bjälevik
-face = nafallo.png
-nick = Nafallo
-
-[http://slomosnail.de/feeds/index.rss2]
-name = Sebastian Dröge
-#face =
-nick = slomo
+nick = mez
 
 [http://blog.init.hr/?cat=ubuntu?&feed=rss2]
 name = Ante Karamatić
@@ -337,14 +268,8 @@
 
 [http://www.mdke.org/?feed=rss2]
 name = Matthew East
-#face =
 nick = mdke
 
-[http://blog.zakame.net/tags/ubuntu/rss]
-name = Zak B. Elep
-face = zakame.png
-nick = zakame
-
 [http://www.vuntz.net/journal/rss.php?lang=en]
 name = Vincent Untz
 face = vuntz.png
@@ -360,11 +285,6 @@
 face = sabdfl.png
 nick = sabdfl
 
-[http://www.raphink.info/feeds/posts/default/-/ubuntu]
-name = Raphael Pinson
-face = raphink.png
-nick = raphink
-
 [http://jonathancarter.co.za/category/free-software/feed]
 name = Jonathan Carter
 face = highvoltage.png
@@ -379,21 +299,6 @@
 name = Evan D.
 nick = ev
 
-[http://blog.omma.net/?feed=rss2]
-name = Henrik Omma
-face = henrik.png
-nick = heno
-
-[http://www.brandonholtsclaw.com/feed]
-name = Brandon Holtsclaw
-face = imbrandon.png
-nick = imbrandon
-
-[http://ubuntudemon.wordpress.com/tag/english/feed/atom]
-name = Ubuntu Demon(Roald Hopman)
-face = hippie_demon_big.gif
-nick = ubuntu_demon
-
 [http://zulcss.wordpress.com/feed/atom]
 name = Chuck Short
 face = Crazy-Stewie.gif
@@ -429,41 +334,21 @@
 face = joeyhg2.png
 nick = joey
 
-[http://joey.ubuntu-rocks.org/blog/feed/]
-name = Joey Stanford
-face = joeyhg2.png
-nick = joey
-
 [http://www.geekosophical.net/?feed=rss2]
 name = Melissa Draper
 face = elkbuntu.png
-nick = elkbuntu
-
-[http://albertomilone.com/wordpress/?feed=rss2]
-name = Alberto Milone
-face = tseliot.png
-nick = albertomilone
+nick = melissa
 
 [http://www.understated.co.uk/category/ubuntu/feed]
 name = Matthew Revell
 face = matthew-revell.jpg
-nick = matthewrevell
-
-[http://www.toniox.org/?feed=rss2&cat=4]
-name = Anthony Mercatante
-face = tonio.png
-nick = Tonio
+nick = matthew.revell
 
 [http://www.sharms.org/atom.xml]
 name = Steven Harms
 face = sharms.png
 nick = sharms
 
-[http://giskard.noblogs.org/rss.php?categoryId=88]
-name = Riccardo Setti
-face = giskard.png
-nick = giskard
-
 [http://www.glatzor.de/blog/select_category/1?type=100]
 name = Sebastian Heinlein
 face = glatzor.png
@@ -479,41 +364,16 @@
 face = sbalneav.png
 nick = sbalneav
 
-[http://gnomefreak-76.livejournal.com/data/rss]
-name = John Vivirito
-face = gnomefreak2.png
-nick = gnomefreak
-
 [http://outflux.net/blog/archives/category/ubuntu/feed]
 name = Kees Cook
 face = keescook.png
 nick = kees
 
-[http://macslow.thepimp.net/wp-rss2.php]
-name = Mirco Müller
-face = macslow.png
-nick = macslow
-
 [http://popey.com/blog/category/ubuntu/feed/]
 name = Alan Pope
 face = alanpope.png
 nick = popey
 
-[http://weblog.licio.eti.br/?feed=rss2]
-name = Licio Fonseca
-face = licio.png
-nick = licio
-
-[http://blog.warma.dk/tag/planetubuntu/feed]
-name = Soren Hansen
-face = soren.png
-nick = soren
-
-[http://hobbsee.wordpress.com/feed]
-name = Sarah Hobbs
-face = hobbsee.png
-nick = hobbsee
-
 [http://www.mikesplanet.net/feed/]
 name = Mike Basinger
 face = mikeb.png
@@ -527,16 +387,6 @@
 name = Jani Monoses
 nick = jani
 
-[http://www.realistanew.com/blog/atom.xml]
-name = Travis Watkins
-face = amaranth.png
-nick = Amaranth
-
-[http://tibsplace.co.uk/blog/index.php/category/free-software/feed]
-name = Toby Smithe
-#face = tsmithe.png
-nick = tsmithe
-
 [http://www.blanco.net.ve/category/ubuntu/en/feed/?mrss=off]
 name = Rolando  Blanco:.
 face = rolando.png
@@ -559,7 +409,6 @@
 
 [http://blog.schwuk.com/category/ubuntu/feed/]
 name = David Murphy
-#face = schwuk.png
 nick = schwuk
 
 [http://beuno.com.ar/feed]
@@ -567,46 +416,25 @@
 face = beuno.png
 nick = beuno
 
-[http://dfarning.livejournal.com/data/rss]
-name = David Farning
-#face = dfarning.png
-nick = dfarning
-
 [http://feeds.feedburner.com/wordpress/ocyO]
 name = Morgan Collett
 face = morgan.png
 nick = morgan
 
-[http://the-space-station.com/tags/planet-ubuntu/feed.atom]
-name = Christopher Denter
-face = dennda.png
-nick = dennda
-
-[http://behindthecircle.org/feed/atom]
-name = Behind the Circle
-#face = behindmotu.png
-nick = sikon
-
-[http://www.belutz.net/category/ubuntu/feed/]
-name = Andi Darmawan
-face = belutz.png
-nick = belutz
-
 [http://blog.daviey.com/feed/]
 name = Dave Walker
 face = davewalker.png
-nick = Daviey
+nick = davewalker
 
 [http://blog.wirelizard.ca/category/ubuntu/feed/]
-# modified 13 May 2014 to only pull my ubuntu category instead of everything
 name = Brian Burger
 face = bburger.png
 nick = bburger
 
 [http://amachu.net/enblog/?cat=13&feed=rss2]
 name = Sri Ramadoss|ஸ்ரீ  ராமதாஸ்
-nick = Amachu|ஆமாச்சு
 face = amachu.png
+nick = amachu
 
 [http://blog.diener.li/feed]
 name = Carlos Diener - emonkey
@@ -618,11 +446,6 @@
 face = andrenoel.png
 nick = andrenoel
 
-#[http://jacob.peddicord.net/category/planet-ubuntu/feed/atom/index.xml]
-#name = Jacob Peddicord
-#face = jpeddicord.png
-#nick = jpeddicord
-
 [http://princessleia.com/journal/?cat=2&feed=rss2]
 name = Elizabeth K. Joseph
 face = lyz.png
@@ -667,10 +490,6 @@
 face = bugman.png
 nick = bugman
 
-[http://ubuntustudio.org/category/planetubuntu/feed/]
-name = Ubuntu Studio
-face = ubuntustudio.png
-
 [http://luisbg.blogalia.com/rdf.xml]
 name = Luis de Bethencourt
 face = luisbg.png
@@ -681,15 +500,10 @@
 face = tjaalton.png
 nick = tjaalton
 
-[http://lucumr.pocoo.org/cogitations/tag/planetubuntu/feed/atom/]
-name = Armin Ronacher
-face = mitsuhiko.png
-nick = mitsuhiko
-
 [http://www.themuso.com/taxonomy/term/1/0/feed]
 name = Luke Yelavich
 face = TheMuso.png
-nick = TheMuso
+nick = themuso
 
 [http://gould.cx/ted/blog/index.rss]
 name = Ted Gould
@@ -698,7 +512,6 @@
 
 [http://stationary-traveller.eu/feeds/tag/ubuntu.atom.xml]
 name = Jelmer Vernooij
-#face = notyet
 nick = jelmer
 
 [http://juliank.wordpress.com/feed/atom]
@@ -708,75 +521,26 @@
 [http://bloc.eurion.net/archives/category/ubuntu-planet/feed]
 name = Siegfried Gevatter
 face = rainct.png
-nick = RainCT
+nick = rainct
 
 [http://www.reponses.net/blog/rss-meta.php?key=tag&value=Ubuntu]
 name = Christophe Sauthier
 face = huats.png
-nick = huats
-
-# [JT - disabled due to sapm, 2014-09-01]
-# [http://tonyyarusso.com/rss.xml]
-# name = Tony Yarusso
-# face = tonyyarusso.png
-# nick = tonyyarusso
-
-[http://www.screenage.de/blog/category/ubuntu/feed]
-name = Caspar Clemens Mierau
-face = ccm.png
-nick = damokles
+nick = christophe.sauthier
 
 [http://jjesse.wordpress.com/category/ubuntukubuntu/feed/atom]
 name = Jonathan Jesse
-#face = noneyet
-nick=jjesse
+nick = jjesse
 
 [http://gamemank.wordpress.com/category/planet%20ubuntu/feed/atom]
 name = Yuriy Kozlov
 face = yuriy-kozlov.png
 nick = yuriy-kozlov
 
-[http://www.bryceharrington.org/wordpress/category/ubuntu/feed]
-name = Bryce Harrington
-face = bryce.png
-nick = bryce
-
-# [http://asac.ws/tagged/ubuntu/rss]
-# name = Alexander Sack
-# face = asac.png
-# nick = asac
-# Currently this breaks as of 2014-08-17, disabling for now
-
-[http://www.asoftsite.org/s9y/feeds/categories/8-Ubuntu.rss]
-name = Alexander Sack (old)
-#face = asac.png
-nick = asac
-
-[http://en.andregondim.eti.br/?feed=rss2]
-name = André Gondim
-face = andregondim.png
-nick = Andre_Gondim
-
-[http://pinstack.blogspot.com/feeds/posts/default/-/Planet%20Ubuntu]
-name = Danny Piccirillo
-face = danny.piccirillo.png
-nick = danny.piccirillo
-
 [http://lucidfox.org/posts/rss/ubuntu]
 name = Maia Kozheva
 face = sikon.png
-nick = Sikon
-
-# No longer a member as of 2013-03-25
-#[http://blog.grossmeier.net/feed/]
-#name = Greg Grossmeier
-#face = greg.grossmeier.png
-#nick = greg-g
-
-[http://ubuntulinuxtipstricks.blogspot.com/feeds/posts/default]
-name = Mackenzie Morgan
-face = maco.m.png
-nick = maco.m
+nick = sikon
 
 [http://feeds.feedburner.com/TheImportantOfBeingHattory]
 name = Paolo Naldini
@@ -810,7 +574,6 @@
 
 [http://mgunes.wordpress.com/tag/planet-ubuntu/feed/atom/]
 name = Murat Güneş
-#face = yourusername.png
 nick = mgunes
 
 [http://dendrobates.wordpress.com/category/Ubuntu/atom]
@@ -823,26 +586,11 @@
 face = ndeschildre.png
 nick = ndeschildre
 
-[http://viperioen.blogspot.com/feeds/posts/default]
-name = Dante Diaz
-face = dante.png
-nick = dante
-
 [http://nhaines.livejournal.com/data/rss?tag=ubuntu]
 name = Nathan Haines
 face = nhaines.png
 nick = nhaines
 
-[http://www.roaksoax.com/category/ubuntu/planet/feed/atom]
-name = Andres Rodriguez
-face = andreserl.png
-nick = andreserl
-
-[http://www.ubuntuserver.org/?feed=atom]
-name = Ubuntu Server blog
-#face =
-nick = robbiew
-
 [http://blog.santiago.zarate.net.ve/feeds/categories/planetas/ubuntu/atom]
 name = Santiago Zarate
 face = santiago-ve.png
@@ -863,11 +611,6 @@
 face = mneptok.png
 nick = mneptok
 
-[http://bnrub.in/rss/]
-name = Benjamin Rubin
-face = bnrubin.png
-nick = bnrubin
-
 [http://ubuntu-mobile-edition.blogspot.com/rss.xml]
 name = Chris Gregan
 face = cgregan.png
@@ -876,8 +619,7 @@
 [http://myrtti.fi/blog/category/ict/planetubuntu/feed]
 name = Miia Ranta
 face = myrtti.png
-nick = Myrtti
-
+nick = myrtti
 
 [http://tripledin.wordpress.com/category/planet-planet-2/feed/atom/]
 name = Mahyuddin Susanto
@@ -888,11 +630,6 @@
 face = russell.john.png
 nick = russell.john
 
-[http://iamtherockstar.com/blog/tags/ubuntu/rss/]
-name = Paul Hummer
-face = paul-hummer.png
-nick = rockstar
-
 [http://feeds.feedburner.com/benmcollins13/ubuntu]
 name = Ben Collins
 face = ben-collins.jpg
@@ -903,11 +640,6 @@
 face = l3on.png
 nick = l3on
 
-[http://www.chuckfrain.net/category/linux/feed]
-name = Chuck Frain
-face = chuckfrain.png
-nick = chuckfrain
-
 [http://www.murraytwins.com/blog/?feed=rss2&cat=8]
 name = Brian Murray
 face = bdmurray.png
@@ -943,11 +675,6 @@
 face = echidnaman.png
 nick = echidnaman
 
-[http://bobbo.me.uk/index.php/category/planet-ubuntu/feed/]
-name = David Futcher
-face = bobbo.png
-nick = bobbo
-
 [http://blog.dustinkirkland.com/feeds/posts/default/-/Ubuntu]
 name = Dustin Kirkland
 face = kirkland.png
@@ -956,16 +683,15 @@
 [http://jameswestby.net/weblog/?flav=rss20]
 name = James Westby
 face = james-w.png
-nick = james_w
+nick = james-w
 
 [http://blog.joeb454.com/tag/ubuntu/feed/atom/]
 name = Joe Barker
 face = joeb454.png
-nick = Joeb454
+nick = joeb454
 
 [http://bryanquigley.com/?feed=atom&tag=planet-ubuntu]
 name = Bryan Quigley
-#face =
 nick = bryanquigley
 
 [http://jussi01.com/?cat=16&feed=rss2]
@@ -978,12 +704,6 @@
 face = mdz.png
 nick = mdz
 
-[http://blog.pfragoso.org/tag/ubuntu/feed/]
-name = Pedro Fragoso
-face = ember.png
-nick = ember
-
-# sponsored by Colin Watson
 [http://blog.redvoodoo.org/feeds/posts/default?alt=rss]
 name = Pete Graner
 face = pgraner.jpg
@@ -992,16 +712,7 @@
 [http://www.arthur-schiwon.de/PlanetUbuntu/feed]
 name = Arthur Schiwon
 face = blizzz.png
-nick = Blizzz
-
-[http://risto.kurppa.fi/blog/tag/planet-ubuntu/feed]
-name = Risto H. Kurppa
-face = risto.kurppa.png
-nick = risto.kurppa
-
-[http://release-blog.ubuntu.com/?feed=rss2]
-name = Ubuntu Release blog
-nick = dholbach
+nick = blizzz
 
 [http://claydoh.com/category/planetubuntu/feed/atom]
 name = Clay Weber
@@ -1011,7 +722,7 @@
 [http://blog.bodhizazen.net/?feed=rss2&cat=Linux]
 name = Bodhi.Zazen
 face = Bodhi.Zazen.png
-nick = Bodhi.Zazen
+nick = bodhi.zazen
 
 [http://ncommander.blogspot.com/feeds/posts/default]
 name = Michael Casadevall
@@ -1020,7 +731,6 @@
 
 [http://blog.mathiaz.net/feeds/posts/default/-/ubuntu]
 name = Mathias Gug
-#face =
 nick = mathiaz
 
 [http://planet-ubuntu.nhandler.com]
@@ -1038,19 +748,8 @@
 face = apulido.png
 nick = apulido
 
-[http://mikerooney.rowk.com/feed/]
-name = Michael Rooney
-face = michael.png
-nick = mrooney
-
-[http://algolibre.com/tag/planetaubuntu/feed/]
-name = Hollman Enciso
-face = hollman.png
-nick = hollman
-
 [http://skitterman.wordpress.com/category/Ubuntu/feed/atom]
 name = Scott Kitterman
-#face =
 nick = kitterman
 
 [http://ernstfamily.ch/jonathan/category/planet-ubuntu/feed]
@@ -1073,11 +772,6 @@
 face = milo.png
 nick = milo
 
-[http://martin-kaufmann.net/blog/wp-rss2.php?cat=13]
-name = Martin Kaufmann
-#face = martin.png
-nick = martin.kaufmann
-
 [http://blog.didrocks.fr/index.php/feed/tag/PU/atom]
 name = Didier Roche
 face = didrocks.png
@@ -1085,7 +779,6 @@
 
 [http://www.marsaud.org/index.php/feed/tag/Planet%20Ubuntu/rss2]
 name = Jonathan Marsaud
-#face = zic.png
 nick = zic
 
 [http://gaspa.yattaweb.it/tags/ubuntu-en/feed/]
@@ -1123,10 +816,6 @@
 face = lfaraone.png
 nick = lfaraone
 
-[http://kyle.mcmartin.ca/.plan/index.php/feed/]
-name = Kyle McMartin
-nick = kylem
-
 [http://michael.lustfield.net/rss.xml]
 name = Michael Lustfield
 face = mtecknology.png
@@ -1134,7 +823,6 @@
 
 [http://blog.smartcube.co.za/feed/]
 name = David Rubin
-#face = drubin.png
 nick = drubin
 
 [http://blog.lynxworks.eu/tag/planet-ubuntu/feed/]
@@ -1142,21 +830,6 @@
 face = dougierichardson.png
 nick = dougierichardson
 
-#[http://doctormo.ubuntu-ma.us/category/ubuntu/feed/?mrss=off]
-#name = Martin Owens
-#face = doctormo.gif
-#nick = DoctorMO
-
-[http://www.blog.matthewlye.com/?feed=rss2]
-name = Matthew Lye
-#face = TBA
-nick = matthew.lye
-
-[http://drowninginbugs.blogspot.com/feeds/posts/default/-/ubuntu]
-name = Daniel T Chen
-#face = noface
-nick = crimsun
-
 [http://blog.nizarus.org/topics/planet-ubuntu/feed/]
 name = Nizar Kerkeni
 face = nizarus.png
@@ -1204,7 +877,6 @@
 
 [http://blog.andrewsomething.com/feeds/all.atom.xml]
 name = Andrew SB
-# face = andrewsomething.png
 nick = andrewsomething
 
 [http://www.davromaniak.eu/index.php?feed/tag/planet.ubuntu.com/rss2]
@@ -1217,17 +889,11 @@
 face = mok0.png
 nick = mok0
 
-[http://njpatel.blogspot.com/feeds/posts/default]
-name = Neil Jagdish Patel
-nick = njpatel
-
-# Peace, Love and C++
 [http://blog.pault.ag/rss]
 name = Paul Tagliamonte
 face = paultag.png
 nick = paultag
 
-# Ceci n est pas une -EPIPE
 [http://notes.pault.ag/feeds/all-en.atom.xml]
 name = Paul Tagliamonte
 face = paultag.png
@@ -1243,11 +909,6 @@
 face = simos.png
 nick = simosx
 
-[http://www.briandcurtis.com/?feed=rss2&cat=3]
-name = Brian Curtis
-face = bcurtiswx.png
-nick = bcurtiswx
-
 [http://penguindroppings.wordpress.com/category/ubuntu/feed/?mrss=off]
 name = Jamie Strandboge
 face = jdstrand.png
@@ -1270,14 +931,8 @@
 
 [http://overbenny.wordpress.com/category/planet-ubuntu/feed/atom]
 name = Benjamin Drung
-#face = bdrung.png
 nick = bdrung
 
-[http://www.linuxsouls.com/taxonomy/term/6/0/feed]
-name = Chris Crisafulli
-face = itnet7.png
-nick = itnet7
-
 [http://wesley.vidiqatch.org/feed/]
 name = Wesley Stessens
 nick = wesley
@@ -1291,11 +946,6 @@
 name = Andreas Moog
 nick = amoog
 
-[http://collinp.com/rss]
-name = Collin Pruitt
-face = hellow.jpg
-nick = collinp
-
 [http://greyrockstudio.blogspot.com/feeds/posts/default?alt=rss]
 name = Eric Hedekar
 face = stochastic.png
@@ -1313,72 +963,47 @@
 
 [http://bobthegnome.blogspot.com/feeds/posts/default]
 name = Robert Ancell
-# face = notyet.png
-nick = robert_ancell
-
-[http://blogs.fsfe.org/myriam/?feed=rss2]
-name = Myriam Schweingruber
-face = myriam.png
-nick = myriam
+nick = robert-ancell
 
 [http://blogs.gnome.org/happyaron/category/ubuntu/feed/]
 name = Aron Xu
-#face = happyaron.png
 nick = happyaron
 
 [http://gilir.wordpress.com/tag/planet-ubuntu/feed/atom/]
 name = Julien Lavergne
-#face = notyet.png
 nick = gilir
 
 [http://quintasan.blogspot.com/feeds/posts/default/-/ubuntu-planet]
 name = Michal Zajac
 face = quintasan.png
-nick = Quintasan
+nick = quintasan
 
 [http://blog.cyphermox.net/feeds/posts/default/-/planet-ubuntu]
 name = Mathieu Trudel
 face = mathieu-tl.png
 nick = mathieu-tl
 
-[http://kjoller.eu/blog/feeds/latest/]
-name = Niels Kjøller Hansen
-face = kjoller.png
-nick = kjoller
-
 [http://theravingrick.blogspot.com/rss.xml]
 name = Rick Spencer
 face = rickspencer3.jpg
-nick = rickspencer3
+nick = rick-rickspencer3
 
 [http://digitalvectorz.wordpress.com/tag/ubuntu/feed/atom/]
 name = Johnathon Mlady
 face = digitalvectorz.png
 nick = digitalvectorz
 
-[http://czam01.blogspot.com/feeds/posts/default/-/PlanetaUbuntu]
-name = Carlos Zambrano
-face = carlos.zambrano.png
-nick = carlos.zambrano
-
 [http://chrisjohnston.org/category/ubuntu-planet/feed]
 name = Chris Johnston
-#face =
-nick = chrisjohnston
+nick = cjohnston
 
 [http://ddorda.useopensource.net/archives/category/ubuntu-planet/feed]
 name = Ddorda
 face = ddorda.png
-nick = Ddorda
-
-[http://blog.lassehavelund.com/index.php/category/ubuntu/feed/]
-name = Lasse Havelund
-face = lhavelund.png
-nick = lhavelund
+nick = ddorda
 
 [http://www.baablogic.net/drupal/taxonomy/term/1/feed]
 name = John Baab
-# face = yourusername.png
 nick = rhpot1991
 
 [http://antoniosanchez.wordpress.com/category/planet-ubuntu/feed/atom]
@@ -1388,50 +1013,36 @@
 
 [http://kristofkiszel.wordpress.com/category/planet-ubuntu/feed/atom]
 name = Kristof Kiszel
-# face =
-nick = Ulyses
+nick = ulysses
 
 [http://www.tm-travolta.net/cat/ubuntu/feed]
 name = Jussi Kekkonen
 face = tmt.png
-nick = Tm_T
+nick = tmt
 
 [http://ken.vandine.org/feeds/posts/default/-/ubuntu]
 name = Ken VanDine
 face = kenvandine.png
-nick = kenvandine
+nick = ken-vandine
 
 [http://tsimpson.ubottu.com/blog/topics/ubuntu/feed]
 name = Terence Simpson
-#face =
 nick = tsimpson
 
 [http://www.theopensourcerer.com/author/alanbell/feed/]
 name = Alan Bell
 face = alanbell.png
-nick = AlanBell
+nick = alanbell
 
 [http://josernestodavila.blogspot.com/feeds/posts/default/-/planet]
 name = Jose Ernesto Davila Pantoja
 face = josernestodavila.png
 nick = josernestodavila
 
-[http://www.sehofstede.nl/cat/planet-ubuntu/feed]
-name = Sense Egbert Hofstede
-face = sense.jpg
-nick = sense
-
 [http://feeds.feedburner.com/tdlk]
 name = Dimitri John Ledkov
 face = xnox.jpg
 nick = xnox
-facewidth = 192
-faceheight = 192
-
-[http://potter.iit.uni-miskolc.hu/~sianis/blog/category/english/feed/atom/]
-name = István Nyitrai
-# face =
-nick = sianis
 
 [http://leftyfb.com/?feed=rss2&cat=4]
 name = Mike Rushton
@@ -1443,11 +1054,6 @@
 face = dylanmccall.png
 nick = dylanmccall
 
-[http://blog.brettalton.com/feed/?cat=ubuntu]
-name = Brett Alton
-face = brett-alton.png
-nick = brettalton
-
 [http://grantbow.wordpress.com/category/ubuntu/feed/?mrss=off]
 name = Grant Bowman
 face = grantbow.png
@@ -1463,27 +1069,11 @@
 face = oubiwann.png
 nick = oubiwann
 
-[http://voices.canonical.com/ronald.mccollam]
-name = Ronald McCollam
-face = fader.png
-nick = fader
-
-[http://feeds.feedburner.com/nigel-ubuntu]
-name = Nigel Babu
-face = nigelbabu.png
-nick = nigelbabu
-
 [http://pendulumtech.wordpress.com/feed/?mrss=off]
 name = Penelope Stowe
 face = pendulum.png
 nick = pendulum
 
-#[http://vorian-ubuntu.blogspot.com/feeds/posts/default]
-#name = Steve Stalcup
-#face = vorian.png
-#nick = vorian
-#Removed by Mike Basinger (under review)
-
 [http://opendarkwing.com/feed/?category=linux]
 name = David Wonderly
 face = wonderly.png
@@ -1494,11 +1084,6 @@
 face = anthonyhook.png
 nick = anthonyhook
 
-[http://akgraner.com/?cat=160&feed=rss2]
-name = Amber Graner
-face = akgraner.png
-nick = akgraner
-
 [http://blog.schauenburg.nl/category/ubuntucom/feed/]
 name = Sebastian Schauenburg
 face = s.schauenburg.png
@@ -1511,14 +1096,8 @@
 
 [http://mhall119.com/tag/ubuntu/feed/]
 name = Michael Hall
-#face = Need Hackergotchi
 nick = mhall119
 
-[http://opensourceroad.blogspot.com/feeds/posts/default]
-name = Michelle Hall
-#face = Need Hackergotchi
-nick = MichelleQ
-
 [http://ubuntu-smoser.blogspot.com/rss.xml]
 name = Scott Moser
 face = smoser.png
@@ -1539,19 +1118,10 @@
 face = apollock.png
 nick = apollock
 
-[http://ubuntuedge.wordpress.com/feed/?mrss=off]
-name = Ubuntu’s Bleeding Edge
-face = ube.png
-
-[http://ingforigua.com/feeds/planeta/rss.xml]
-name = Ingeniero Forigua
-face = ingforigua.png
-nick = ingforigua
-
 [http://randall.executiv.es/taxonomy/term/5/0/feed]
 name = Randall Ross
 face = rrnwexec.png
-nick = rrnwexec
+nick = randall
 
 [http://9m2pju.blogspot.com/feeds/posts/default/-/ubuntu]
 name = Mohamad Faizul Zulkifli
@@ -1565,7 +1135,6 @@
 
 [http://agateau.com/feed]
 name = Aurélien Gâteau
-#face = agateau.png
 nick = agateau
 
 [http://raphaelhertzog.com/feed/planets/]
@@ -1579,25 +1148,15 @@
 nick = slavender
 
 [http://rhonda.deb.at/blog/?flav=rss&lang=en]
-name = Rhonda D'Vine
+name = Rhonda D'Vine
 face = rhonda.png
 nick = rhonda
 
-[http://switch2tux.wordpress.com/category/ubuntu-in-general/feed/?mrss=off]
-name = Zach Kriesse
-face = zkriesse.png
-nick = zkriesse
-
 [http://fullcirclemagazine.org/feed/]
 name = Ronnie Tucker
 face = ronnietucker.png
 nick = ronnietucker
 
-[http://serial-coder.co.uk/blog/category/ubuntu-planet/feed/?mrss=off]
-name = s.fox
-face = silver-fox.png
-nick = silver-fox
-
 [http://yoboy.fr/planet/ubuntu/feed?language=en]
 name = Philippe Cortez
 face = yoboy.png
@@ -1621,7 +1180,7 @@
 [http://www.j-baer.com/?cat=planet-ubuntu&feed=rss2]
 name = John Baer
 face = j_baer.png
-nick = j_baer
+nick = j.baer
 
 [http://dindafoss.wordpress.com/category/ubuntu/feed/?mrss=off]
 name = Belinda Lopez
@@ -1630,7 +1189,6 @@
 
 [http://blog.itsbilal.com/index.php/tag/planet-ubuntu/feed/]
 name = Bilal Akhtar
-#face =
 nick = bilalakhtar
 
 [http://tumbleweed.org.za/tags/ubuntu/feed]
@@ -1638,11 +1196,6 @@
 face = stefanor.png
 nick = stefanor
 
-[http://deindre.wordpress.com/category/ubuntu/feed/atom]
-name = Flavia Weisghizzi
-face = flavia.weisghizzi.png
-nick = flavia.weisghizzi
-
 [http://foss-boss.blogspot.com/feeds/posts/default/-/ubuntu-planet]
 name = Ahmed Kamal
 face = kim0.png
@@ -1661,11 +1214,10 @@
 [http://linuxgrandma.blogspot.com/feeds/posts/default]
 name = Valorie Zimmerman
 face = valorie.png
-nick = valorie
+nick = valorie-zimmerman
 
 [http://blogs.gnome.org/lferrett/feed/]
 name = Luca Ferretti
-#face = elle.uca.png
 nick = elle.uca
 
 [http://blog.thetys-retz.net/feed/tag/PlanetUbuntu/atom]
@@ -1673,14 +1225,8 @@
 face = vincentxavier.png
 nick = vincentxavier
 
-[http://supermario-world.blogspot.com/feeds/posts/default]
-name = Mario Limonciello
-face = superm1.png
-nick = superm1
-
 [http://dmtechtalk.wordpress.com/category/ubuntu-2/feed/atom/]
 name = David Mandala
-#face =
 nick = davidm
 
 [http://thinkonbytes.blogspot.com/feeds/posts/default/-/planet]
@@ -1695,7 +1241,6 @@
 
 [http://itigloo.com/category/planet-ubuntu/feed/atom]
 name = Chris Woollard
-#face =
 nick = cwoollard
 
 [http://desentropia.com/category/ubuntu/feed]
@@ -1711,12 +1256,12 @@
 [http://orangesquash.org.uk/~laney/tags/planetubuntu/index.atom]
 name = Iain Lane
 face = laney.png
-nick = Laney
+nick = laney
 
 [http://diegoturcios.blogspot.com/feeds/posts/default/-/planet-ubuntu]
 name = Diego Turcios
 face = diegotc.jpeg
-nick = DiegoTc
+nick = diegoturcios
 
 [http://artfwo.blogspot.com/feeds/posts/default/-/ubuntu]
 name = Artem Popov
@@ -1725,19 +1270,12 @@
 
 [http://smash.nobuto-murata.org/feeds/posts/default/-/Planet%20Ubuntu?max-results=5]
 name = Nobuto MURATA
-# face = nobuto.png
 nick = nobuto
 
 [http://steveire.wordpress.com/feed/?mrss=off]
 name = Stephen Kelly
-# face =
 nick = steveire
 
-[https://ddecator.wordpress.com/category/tech/feed/?mrss=off]
-name = Draycen DeCator
-# face =
-nick = ddecator
-
 [http://feeds.feedburner.com/kryogenix]
 name = Stuart Langridge
 face = sil.png
@@ -1750,7 +1288,6 @@
 
 [http://kyofel.wordpress.com/category/planet-ubuntu/feed/?mrss=off]
 name = Philip Muskovac
-# face =
 nick = yofel
 
 [http://sergioandresmeneses.wordpress.com/category/planet-ubuntu/feed/?mrss=off]
@@ -1765,17 +1302,10 @@
 
 [http://ubuntumug.wordpress.com/category/planet-ubuntu/feed/?mrss=off]
 name = László Torma
-# face =
 nick = tormalaszlo
 
-[http://cloud.ubuntu.com/tag/planet/feed/]
-name = Ubuntu Cloud Portal
-face = cloudportal.png
-nick = cloudportal
-
 [http://www.mashos.com/feeds/posts/default/-/ubuntu]
 name = Thomas Mashos
-#face = tgm4883.png
 nick = tgm4883
 
 [http://www.en.salvatorepalma.net/category/planet-ubuntu/feed/]
@@ -1790,7 +1320,6 @@
 
 [http://maystreet.tumblr.com/rss]
 name = Nick HS
-#face = notmyface.png
 nick = nickhs
 
 [http://kshadeslayer.wordpress.com/category/kubuntu/feed/?mrss=off]
@@ -1798,14 +1327,8 @@
 face = rohan.png
 nick = rohangarg
 
-[http://jeremy.bicha.net/category/ubuntu/feed/?mrss=off]
-name = Jeremy Bicha
-face = design.png
-nick = jbicha
-
 [http://awhitcroft.blogspot.com/feeds/posts/default/-/planet%20ubuntu]
 name = Andy Whitcroft
-#face = nofaceyet.png
 nick = apw
 
 [http://lkubuntu.wordpress.com/feed/?mrss=off]
@@ -1837,11 +1360,6 @@
 name = Serge Hallyn
 nick = serge-hallyn
 
-[http://blog.romainperier.org/?cat=7&feed=rss2]
-name = Romain Perier
-face = bambi.png
-nick = bambi
-
 [http://www.korporation.cl/blog/category/ubuntu-en/feed/?mrss=off]
 name = Victor Vargas
 face = kamusin.png
@@ -1849,7 +1367,6 @@
 
 [http://www.zygoon.pl/feeds/posts/default/-/ubuntu]
 name = Zygmunt Krynicki
-#face = none
 nick = zkrynicki
 
 [http://philipballew.wordpress.com/feed/?mrss=off]
@@ -1887,11 +1404,6 @@
 face = tiagohillebrandt.png
 nick = tiagohillebrandt
 
-#[http://bulldog98-jonathansblog.blogspot.com/feeds/posts/default/-/PlanetKDE]
-#name = Jonathan Raphael Joachim Kolberg
-#face = bulldog98.org
-#nick = bulldog98
-
 [http://blog.josephliau.com/category/ubuntu-community/feed/]
 name = Joe Liau
 face = joseph-liau.png
@@ -1899,12 +1411,8 @@
 
 [http://web.dodds.net/~vorlon/wiki/ubuntu/index.rss]
 name = Steve Langasek
-face = vorlon
-
-[http://blog.jamesrgifford.com/blog/categories/ubuntu-planet/atom.xml]
-name = James Gifford
-face = jamesgifford.png
-nick = jamesgifford
+face = vorlon.png
+nick = vorlon
 
 [http://lubuntublog.blogspot.com/feeds/posts/default]
 name = Lubuntu Blog
@@ -1919,23 +1427,18 @@
 [http://feeds.feedburner.com/OliUbuntu]
 name = Oli Warner
 face = oli.png
-nick = Oli
+nick = oli
 
 [http://cheesehead-techblog.blogspot.com/feeds/posts/default/-/planet-ubuntu]
 name = Ian Weisser
 face = ian-weisser.png
-nick = Cheesehead
+nick = ian-weisser
 
 [http://cptmashek.thescoundrels.net/tag/ubuntu/feed]
 name = Thomas Mashek
 face = tenach.png
 nick = tenach
 
-[http://developer.ubuntu.com/en/blog/feeds/tags/planet-ubuntu/]
-name = Ubuntu App Developer Blog
-face = ubuntuappdevelopers.png
-nick = dpm
-
 [http://www.andreagrandi.it/category/ubuntu-en/feed/]
 name = Andrea Grandi
 face = andreagrandi.png
@@ -1962,12 +1465,10 @@
 
 [http://certifiably.wordpress.com/feed/]
 name = Brendan Donegan
-#face = None
 nick = brendan-donegan
 
 [http://cariboo907.blog.com/feed/]
 name = Jim Kielman
-#face = none
 nick = cariboo907
 
 [http://smackerelofopinion.blogspot.com/feeds/posts/default]
@@ -1980,16 +1481,6 @@
 face = stefano-palazzo.png
 nick = stefano-palazzo
 
-[http://benonsoftware.com/feed/]
-name = Benjamin Donald-Wilson
-#face = None
-nick = benny
-
-[http://blog.sourcecode.de/blog/categories/ubuntu/atom.xml]
-name = Stephan Adig
-face = sadig.png
-nick = sadig
-
 [http://thorwil.wordpress.com/category/planet-ubuntu/feed/?mrss=off]
 name = Thorsten Wilms
 face = thorwil.png
@@ -2005,21 +1496,11 @@
 face = chilicuil.png
 nick = chilicuil
 
-[http://blog.mattrudge.net/feed/?mrss=off]
-name = Matt Rudge
-face = mrudge.png
-nick = mrudge
-
 [http://allisonrandal.com/category/ubuntu/feed]
 name = Allison Randal
 face = allison.png
 nick = allison
 
-[http://erielookingproductions.info/ubuntu/index.rss]
-name = Stephen Michael Kellat
-face = skellat.jpg
-nick = skellat
-
 [http://joseeantonior.wordpress.com/category/planet-ubuntu/feed/atom]
 name = José Antonio Rey
 face = joseeantonior.png
@@ -2027,11 +1508,7 @@
 
 [http://unbrokenspectrum.wordpress.com/category/planet-ubuntu/feed/?mrss=off]
 name = Barneedhar
-nick = jokerdino
-
-[http://unbrokenspectrum.tumblr.com/tagged/ubuntu/rss]
-name = Barneedhar
-nick = jokerdino
+nick = barneedhar
 
 [http://torstenfranz.wordpress.com/category/planet-ubuntu/feed/?mrss=off]
 name = Torsten Franz
@@ -2057,17 +1534,6 @@
 face = mfisch.png
 nick = mfisch
 
-
-[http://www.theorangenotebook.com/feeds/posts/default]
-name = Nicholas Skaggs
-face = nskaggs.png
-nick = nskaggs
-
-[http://blogs.gnome.org/jamesh/feed/]
-name = James Henstridge
-face = jamesh.png
-nick = jamesh
-
 [http://toabctl.wordpress.com/category/planet-ubuntu/feed/?mrss=off]
 name = Thomas Bechtold
 face = toabctl.png
@@ -2078,11 +1544,6 @@
 face = jcrigby.png
 nick = jcrigby
 
-[http://fitoschido.wordpress.com/category/planet-ubuntu/feed/?mrss=off]
-name = Adolfo Jayme Barrientos
-face = fito.jpg
-nick = fitoschido
-
 [http://dark-net.net/?tag=ubuntu-planet&feed=rss2]
 name = Thomas Ward
 face = teward.png
@@ -2105,7 +1566,6 @@
 
 [http://jk.ozlabs.org/feeds/rss/]
 name = Jeremy Kerr
-#face = jk-ozlabs.png
 nick = jk-ozlabs
 
 [http://www.notgary.com/feeds/posts/default]
@@ -2113,11 +1573,6 @@
 face = notgary.png
 nick = notgary
 
-[http://rtg.in.ua/tag/ubuntu-planet/feed/atom/]
-name = Roman Yepishev
-face = rye.jpg
-nick = rye
-
 [http://nlsthzn.com/category/planet-ubuntu/feed]
 name = Neil Oosthuizen
 face = nlsthzn.png
@@ -2140,34 +1595,18 @@
 
 [http://gonzotech.tumblr.com/tagged/planet/rss]
 name = Rik Goldman
-#face
 nick = rikgoldman
 
 [http://feeds.feedburner.com/ADAMJSUbuntuFeed]
 name = Adam Stokes
 face = adam-stokes.png
-nick = stokachu
-
-[http://smartboyhwubuntu.wordpress.com/category/planet-ubuntu/feed/?mrss=off]
-name = Howard Chan
-#face
-nick = smartboyhw
-
-[http://www.joelp.me/blog/?tag=ubuntu&feed=rss2]
-name = Joel Pickett
-face = jpickett.png
-nick = jpickett
+nick = adam-stokes
 
 [http://zequence.net/category/ubuntustudio/feed/]
 name = Kaj Ailomaa
 face = zequence.png
 nick = zequence
 
-[http://vibhav01.wordpress.com/category/planet/]
-name = Vibhav Pant
-#face
-nick = vibhavp
-
 [http://blog.cooperteam.net/feeds/posts/default/-/ubuntu]
 name = Christopher James Halse Rogers
 face = raof.png
@@ -2180,8 +1619,12 @@
 
 [http://samohtv.wordpress.com/category/planet-ubuntu/feed/?mrss=off]
 name = Thomas Voß
-#face
-nick = tvoss
+nick = thomas-voss
+
+[http://snwh.org/blog/feed.xml?mrss=off]
+name = Sam Hewitt
+face = snwh.png
+nick = snwh
 
 [http://mechoslav.wordpress.com/category/ubuntu/feed/atom/?mrss=off]
 name = Georgi Karavasilev
@@ -2189,8 +1632,7 @@
 nick = kokoto-java
 
 [http://airurando.wordpress.com/category/ubuntu/feed/]
-name = Mike O'Donohue
-#face = yourusername.png
+name = Mike O'Donohue
 nick = airurando
 
 [http://daker.me/feed-ubuntuplanet.xml]
@@ -2236,13 +1678,8 @@
 face = rpadovani.png
 nick = rpadovani
 
-[http://wire.kubuntu.org/?feed=rss2]
-name = Kubuntu Wire
-face = kubuntu-wire.png
-
 [http://svij.org/feeds/ubuntu-planet-tag.atom.xml]
 name = Sujeevan Vijayakumaran
-#face
 nick = svij
 
 [http://danielpocock.com/tags/ubuntu/feed]
@@ -2253,7 +1690,7 @@
 [http://vizZzion.org/blog/category/english/feed/]
 name = Sebastian Kügler
 face = sebas.png
-nick = sebas
+nick = sebasje
 
 [http://blog.3v1n0.net/tag/planet-ubuntu/feed/]
 name = Marco Trevisan (Treviño)
@@ -2270,15 +1707,108 @@
 face = system76chick.png
 nick = system76chick
 
-[http://www.tech-foo.net/tag/ubuntu.html]
+[http://blog.dpniel.com/?feed=rss2]
+name = Dan Chapman
+face = dpniel.png
+nick = dpniel
+
+[http://blog.digital-scurf.org/?flav=atom&planet=ubuntu]
+name = Daniel Silverstone
+face = kinnison.png
+nick = dsilvers
+
+[http://www.raphink.info/feeds/posts/default/-/ubuntu]
+name = Raphael Pinson
+face = raphink.png
+nick = raphink
+
+[http://albertomilone.com/wordpress/?feed=rss2]
+name = Alberto Milone
+face = tseliot.png
+nick = albertomilone
+
+[http://blog.warma.dk/tag/planetubuntu/feed]
+name = Soren Hansen
+face = soren.png
+nick = soren
+
+[http://www.belutz.net/category/ubuntu/feed/]
+name = Andi Darmawan
+face = belutz.png
+nick = belutz
+
+[http://drowninginbugs.blogspot.com/feeds/posts/default/-/ubuntu]
+name = Daniel T Chen
+nick = crimsun
+
+[http://collinp.com/rss]
+name = Collin Pruitt
+face = hellow.jpg
+nick = collinp
+
+[http://blogs.fsfe.org/myriam/?feed=rss2]
+name = Myriam Schweingruber
+face = myriam.png
+nick = myriam
+
+[http://www.theorangenotebook.com/feeds/posts/default]
+name = Nicholas Skaggs
+face = nskaggs.png
+nick = nskaggs
+
+[http://supermario-world.blogspot.com/feeds/posts/default]
+name = Mario Limonciello
+face = superm1.png
+nick = superm1
+
+[http://ubuntulinuxtipstricks.blogspot.com/feeds/posts/default]
+name = Mackenzie Morgan
+face = maco.m.png
+nick = maco.m
+
+[http://blog.sourcecode.de/blog/categories/ubuntu/atom.xml]
+name = Stephan Adig
+face = sadig.png
+nick = sadig
+
+[http://www.linuxsouls.com/taxonomy/term/6/feed]
+name = Chris Crisafulli
+face = itnet7.png
+nick = itnet7
+
+[http://denter.org/rss.xml]
+name = Christopher Denter
+face = dennda.png
+nick = dennda
+
+[http://giskard.noblogs.org/post/category/ubuntu/feed/]
+name = Riccardo Setti
+face = giskard.png
+nick = giskard
+
+[https://coaxion.net/blog/feed/]
+name = Sebastian Dröge
+nick = slomo
+
+[http://blogs.gnome.org/seb128/feed/]
+name = Sebastien Bacher
+face = seb128.png
+nick = seb128
+
+[http://www.tech-foo.net/feeds/tag-ubuntu.atom.xml]
 name = Thomi Richards
 face = thomir.png
 nick = thomir
 
-[http://blog.dpniel.com/?feed=rss2]
-name = Dan Chapman
-face = dpniel.png
-nick = DanChapman
+[http://www.nafallo.info/blog/atom-en.xml]
+name = Christian Bjälevik
+face = nafallo.png
+nick = nafallo
+
+[http://mikerooney.rowk.com/feed/]
+name = Michael Rooney
+face = michael.png
+nick = mrooney
 
 [http://blog.dasroot.net/tag/planet/rss/]
 name = Charles Butler
@@ -2290,20 +1820,19 @@
 face = silverlion.png
 nick = silverlion
 
+[http://erielookingproductions.info/ubuntu/index.rss]
+name = Stephen Michael Kellat
+face = skellat.jpg
+nick = skellat
+
 [http://scarlettgatelyclark.com/category/Kubuntu/feed/]
 name = Scarlett Clark
 face = sgclark.png
 nick = sgclark
 
-[http://ubuntuforumsorg.wordpress.com/category/ubuntu/feed/?mrss=off]
-name = Forums Council
-face = uflogo.png
-nick = elfy
-
-[sweetfoss.wordpress.com]
+[https://sweetfoss.wordpress.com/feed/]
 name = Aaron Honeycutt
-#face = myface.png
-nick = ahoneybun
+nick = aaronhoneycutt
 
 [http://polka.bike/blog/category/planet-ubuntu/feed/index.xml]
 name = Walter Lapchynski
@@ -2315,11 +1844,6 @@
 face = mbruzek.png
 nick = mbruzek
 
-[http://snwh.org/blog/feed.xml?mrss=off]
-name = Sam Hewitt
-face = snwh.png
-nick = snwh
-
 [http://blog.geekaliens.com/feed/?tag=cat-kde]
 name = Ovidiu-Florin Bogdan
 nick = ovidiu-florin
@@ -2339,3 +1863,27 @@
 face = paulw2u.png
 nick = paulw2u
 
+[http://akgraner.com/?cat=160&feed=rss2]
+name = Amber Graner
+face = akgraner.png
+nick = akgraner
+
+[http://deindre.wordpress.com/category/ubuntu/feed/atom]
+name = Flavia Weisghizzi
+face = flavia.weisghizzi.png
+nick = flavia.weisghizzi
+
+[http://asac.ws/tagged/ubuntu/rss]
+name = Alexander Sack
+face = asac.png
+nick = asac
+
+[http://www.brandonholtsclaw.com/feed]
+name = Brandon Holtsclaw
+face = imbrandon.png
+nick = imbrandon
+
+[http://www.bryceharrington.org/wordpress/category/ubuntu/feed]
+name = Bryce Harrington
+face = bryce.png
+nick = bryce

=== added file 'config_old.ini'
--- config_old.ini	1970-01-01 00:00:00 +0000
+++ config_old.ini	2015-01-23 16:34:19 +0000
@@ -0,0 +1,229 @@
+###  Temporarily commented out
+
+# REASON: Hiatus
+[http://ohio.ubuntu-us.org/burningcircle/feed]
+name = Ubuntu Ohio - Burning Circle
+nick = skellat
+
+# REASON: Hiatus
+[http://blog.mattrudge.net/feed/?mrss=off]
+name = Matt Rudge
+face = mrudge.png
+nick = mrudge
+
+# REASON: No content
+[http://martin-kaufmann.net/blog/wp-rss2.php?cat=13]
+name = Martin Kaufmann
+nick = martin.kaufmann
+
+# REASON: No content
+[http://www.blog.matthewlye.com/?feed=rss2]
+name = Matthew Lye
+nick = matthew.lye
+
+# REASON: Site not loading
+[http://haecceity.clearairturbulence.org/xml/atom/category/tech/feed.xml]
+name = Thom May
+face = thom.png
+nick = thombot
+
+# REASON: Site not loading
+[http://raw.no/personal/blog/tech/?flav=rss]
+name = Tollef Fog Heen
+face = mithrandir.png
+nick = tfheen
+
+# REASON: No content
+[http://www.realistanew.com/blog/atom.xml]
+name = Travis Watkins
+face = amaranth.png
+nick = amaranth
+
+# REASON: No content
+[http://vibhav01.wordpress.com/category/planet/]
+name = Vibhav Pant
+nick = vibhavp
+
+# REASON: No content
+[http://blog.zakame.net/tags/ubuntu/rss]
+name = Zak B. Elep
+face = zakame.png
+nick = zakame
+
+# REASON: Protected blog
+[http://valueerror.wordpress.com/category/planet-ubuntu/feed/atom/]
+name = Andrea Corbellini
+nick = andrea.corbellini
+
+# REASON: HTTP 403/404
+[http://www.roaksoax.com/category/ubuntu/planet/feed/atom]
+name = Andres Rodriguez
+face = andreserl.png
+nick = andreserl
+
+# REASON: HTTP 404
+[http://www.toniox.org/?feed=rss2&cat=4]
+name = Anthony Mercatante
+face = tonio.png
+nick = tonio
+
+# REASON: No content
+[http://bnrub.in/rss/]
+name = Benjamin Rubin
+face = bnrubin.png
+nick = bnrubin
+
+# REASON: Site does not load
+[http://iamtherockstar.com/blog/tags/ubuntu/rss/]
+name = Paul Hummer
+face = paul-hummer.png
+nick = rockstar
+
+# REASON: No content
+[http://risto.kurppa.fi/blog/tag/planet-ubuntu/feed]
+name = Risto H. Kurppa
+face = risto.kurppa.png
+nick = risto.kurppa
+
+# REASON: Spam (2014-09-01)
+[http://tonyyarusso.com/rss.xml]
+name = Tony Yarusso
+face = tonyyarusso.png
+nick = tonyyarusso
+
+
+###  Not a member of ~ubuntumembers
+
+[http://nxvl.blogspot.com/feeds/posts/default/-/en]
+name = Nicolas Valcárcel
+face = nxvl.png
+nick = nvalcarcel
+
+[http://gnomefreak-76.livejournal.com/data/rss]
+name = John Vivirito
+face = gnomefreak2.png
+nick = gnomefreak
+
+[http://weblog.licio.eti.br/?feed=rss2]
+name = Licio Fonseca
+face = licio.png
+nick = licio
+
+[http://www.screenage.de/blog/category/ubuntu/feed]
+name = Caspar Clemens Mierau
+face = ccm.png
+nick = damokles
+
+[http://algolibre.com/tag/planetaubuntu/feed/]
+name = Hollman Enciso
+face = hollman.png
+nick = hollman
+
+[http://njpatel.blogspot.com/feeds/posts/default]
+name = Neil Jagdish Patel
+nick = njpatel
+
+[http://kjoller.eu/blog/feeds/latest/]
+name = Niels Kjøller Hansen
+face = kjoller.png
+nick = kjoller
+
+[http://www.sehofstede.nl/cat/planet-ubuntu/feed]
+name = Sense Egbert Hofstede
+face = sense.jpg
+nick = sense
+
+[http://feeds.feedburner.com/nigel-ubuntu]
+name = Nigel Babu
+face = nigelbabu.png
+nick = nigelbabu
+
+[http://jeremy.bicha.net/category/ubuntu/feed/?mrss=off]
+name = Jeremy Bicha
+face = design.png
+nick = jbicha
+
+[http://blogs.gnome.org/jamesh/feed/]
+name = James Henstridge
+face = jamesh.png
+nick = jamesh
+
+[http://rtg.in.ua/tag/ubuntu-planet/feed/atom/]
+name = Roman Yepishev
+face = rye.jpg
+nick = rye
+
+[http://blog.omma.net/?feed=rss2]
+name = Henrik Omma
+face = henrik.png
+nick = henrik
+
+[http://ubuntudemon.wordpress.com/tag/english/feed/atom]
+name = Ubuntu Demon(Roald Hopman)
+face = hippie_demon_big.gif
+nick = ubuntu-demon
+
+[http://blog.romainperier.org/?cat=7&feed=rss2]
+name = Romain Perier
+face = bambi.png
+nick = rperier
+
+[http://engage.wordpress.com/tag/ubuntu/feed/atom]
+name = Jerome S. Gotangco
+face = jsgotangco.png
+nick = jsgotangco
+
+[http://en.andregondim.eti.br/?feed=rss2]
+name = André Gondim
+face = andregondim.png
+nick = andregondim
+
+[http://ubuntuedge.wordpress.com/feed/?mrss=off]
+name = Ubuntu’s Bleeding Edge
+face = ube.png
+nick = jdub
+
+[http://lucumr.pocoo.org/feed.atom]
+name = Armin Ronacher
+face = mitsuhiko.png
+nick = mitsuhiko
+
+[http://www.netsplit.com/feed/atom]
+name = Scott James Remnant
+face = keybuk.png
+nick = scott
+
+[http://carlos.pemas.net/blog?flav=rss]
+name = Carlos Perelló Marín
+face = carlos.png
+nick = carlos
+
+[http://doctormo.ubuntu-ma.us/category/ubuntu/feed/?mrss=off]
+name = Martin Owens
+face = doctormo.gif
+nick = doctormo
+
+[http://smarterits.com/~brandon/log/wp-rss2.php]
+name = Brandon Hale
+face = tseng.png
+nick = brandon
+
+[http://www.larvalstage.net/index.php?/feeds/categories/4-ubuntu.rss]
+name = Jerry Haltom
+face = wasabi.png
+nick = wasabi
+
+[http://jacob.peddicord.net/category/planet-ubuntu/feed/atom/index.xml]
+name = Jacob Peddicord
+face = jpeddicord.png
+nick = jpeddicord
+
+[http://blog.grossmeier.net/feed/]
+name = Greg Grossmeier
+face = greg.grossmeier.png
+nick = greg.grossmeier
+
+[http://bulldog98-jonathansblog.blogspot.com/feeds/posts/default/-/PlanetKDE]
+name = Jonathan Raphael Joachim Kolberg
+face = bulldog98.org
+nick = bulldog98

=== added file 'heads/rpadovani.png'
Binary files heads/rpadovani.png	1970-01-01 00:00:00 +0000 and heads/rpadovani.png	2015-01-23 16:34:19 +0000 differ
=== removed file 'heads/rpadovani.png'
Binary files heads/rpadovani.png	2014-12-21 18:15:51 +0000 and heads/rpadovani.png	1970-01-01 00:00:00 +0000 differ
=== removed directory 'new'