Did some work on the trunk.  Needs to be merged with Geoffrey's changes.
Did some work on the trunk.  Needs to be merged with Geoffrey's changes.

songfj/simplepie,mblaney/simplepie,wikidi/simplepie,wikidi/simplepie,Alexia/SimplePie,blat/simplepie,barryvdh/simplepie,FreshRSS/simplepie,skyzyx/simplepie,songfj/simplepie,ropik/simplepie,songfj/simplepie,wikidi/simplepie,barryvdh/simplepie,skyzyx/simplepie,gsnedders/complexpie,Alkarex/simplepie,FreshRSS/simplepie,blat/simplepie,simplepie/simplepie,Alkarex/simplepie,Alexia/SimplePie,simplepie/simplepie,mblaney/simplepie,Alkarex/simplepie,ropik/simplepie,barryvdh/simplepie,blat/simplepie