Add a command to fix aliases on the intranet site.
Fix a merge conflict in scrape.drush.inc