Update core to drupal 6.31 and various contrib