Remove incorrect Bower conf
Fix bad merge that messed up COUNT aggregations