merged newspartners
erge branch 'master' of https://github.com/sinker/mozilla-opennews

merging everything back together after a bit of stupidity on my part