Edinburgh climbs two places in global rankings