Now with elasticsearch, phantomjs and various fixes (oh my)