store cleanup
news cleanup
resolve merge conflict
Merge pull request #66 from calblueprint/kevin/store_and_news_cleanup

Kevin/store and news cleanup