Core: Began the updating the drupal-org.make
Misc: Minor updates
Misc: Resolved conflicts.
Misc: Fixed @amcgowanca's bad error.
Core: Updated the drupal-org.make with remaining modules from Trent.
Core: Finished updating the drupal-org.make
Bugfix: Minor typo bugfixes.
Misc: Resolved merge conflicts.