fixing news mapping to support atom and rss
cleaning up and prepping for release
fixing conflict