Consolidate bottle defaults and remove a method

Library/Homebrew/bottles.rb

@@ -67,13 +67,8 @@ def bottle_regex
   Pathname::BOTTLE_EXTNAME_RX
 end
 
-def bottle_root_url f
-  root_url = f.bottle.root_url
-  root_url ||= 'https://downloads.sf.net/project/machomebrew/Bottles'
-end
-
 def bottle_url f, tag=bottle_tag
-  "#{bottle_root_url(f)}/#{bottle_filename(f, {:tag => tag})}"
+  "#{f.bottle.root_url}/#{bottle_filename(f, :tag => tag)}"
 end
 
 def bottle_tag

Library/Homebrew/software_spec.rb

@@ -98,7 +98,7 @@ class Bottle < SoftwareSpec
     @revision = 0
     @prefix = '/usr/local'
     @cellar = '/usr/local/Cellar'
-    @root_url = nil
+    @root_url = 'https://downloads.sf.net/project/machomebrew/Bottles'
   end
 
   # Checksum methods in the DSL's bottle block optionally take