Update drupal-org.make
Merge pull request #1582 from sylus/7.x-1.x

Updates for 1.x branch.