Core: Began the updating the drupal-org.make
Misc: Minor updates
Misc: Resolved conflicts.
Misc: Fixed @amcgowanca's bad error.