Update drupal-org-core.make so modules are assigned to the contrib
folder, removed contrib modules from the install profile