#245 Finished merging

I tried out all the requirements and didn't have any problems with them. I did get a duplicate cached version of a story that I cached after I uploaded it to ES though. I'm not sure where that is coming from.