Upgrade to new OAuth1 strategy; Make compatible with Drupal 7