Added drupal-org.make and cleaned up .info files.
Merge pull request #7 from amcgowanca/7.x-1.x

Added drupal-org.make and cleaned up .info files.