Deploy_7 code has an unused old_uri

This code does not really make sense...

$new_url = drush_get_option('uri');
$old_url = drush_get_option('uri', 'site');

I'll commit an initial cleanup soon... and would like to follow up with more code ported from deploy.inc that's D6 specific.