Some are born with conflicts, some achieve conflicts, some have conflicts thrust upon 'em.
fixing commits Merge branch 'master' into UF-71
cleaned up drupal-org.make and skeletor.install
We are such stuff as conflicts are made on
Merge pull request #40 from Webcraft-Myplanet/UF-71

UF 71