Added check to drush file to make sure that  is set; some minor cleanup of same file.