Merges changes from Dion Designs :)
Corrected cross-posting
Fixed up SQL stuff
Merge more changes
Fixed up the xml
Removed clock and added S_ENABLE_FEEDS