switch editorial and trending boxes
uses users ivar (with correct scores)
fix conflicts in index.haml