Issue #1950148 by notzach: Update drupal core to 7.21
Issue #1950156 by notzach: Update views to 3.6