Update drupal-org.make

using discipolos version of discography (includes simpletests)